From: Roan Kattouw Date: Thu, 2 Jun 2011 15:42:23 +0000 (+0000) Subject: Fix regression in r84638, causing ArticleDeleteComplete to be called twice on file... X-Git-Tag: 1.31.0-rc.0~29771 X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=ab24b1f826b61ae0edd234c375bd72b2ac888732;p=lhc%2Fweb%2Fwiklou.git Fix regression in r84638, causing ArticleDeleteComplete to be called twice on file deletions. doDeleteArticle() already calls it, there's no need for FileDeleteForm::doDelete() to call it again --- diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index 2c87ccc99b..f16036b432 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -131,7 +131,6 @@ class FileDeleteForm { $status = $file->delete( $reason, $suppress ); if( $status->ok ) { $dbw->commit(); - wfRunHooks( 'ArticleDeleteComplete', array( &$article, &$wgUser, $reason, $id ) ); } else { $dbw->rollback(); }