From: Alexandre Emsenhuber Date: Sun, 1 Jul 2012 20:09:11 +0000 (+0200) Subject: Use ManualLogEntry instead of LogPage to add a new log entry of old file version... X-Git-Tag: 1.31.0-rc.0~23172^2 X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=4ea5e0340c60aad92fcf9e16e279045af313ab1f;p=lhc%2Fweb%2Fwiklou.git Use ManualLogEntry instead of LogPage to add a new log entry of old file version deletion. * For consistency with WikiPage::doDeleteArticleReal(). * Also log suppressed deletions in suppression log instead of normal log. Change-Id: Ie63bac5ebd77d0269ba2075d66cf3ba31668e595 --- diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index bface857c2..ecdb5ba960 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -156,12 +156,19 @@ class FileDeleteForm { $status = $file->deleteOld( $oldimage, $reason, $suppress ); if( $status->ok ) { // Need to do a log item - $log = new LogPage( 'delete' ); $logComment = wfMsgForContent( 'deletedrevision', $oldimage ); if( trim( $reason ) != '' ) { $logComment .= wfMsgForContent( 'colon-separator' ) . $reason; } - $log->addEntry( 'delete', $title, $logComment ); + + $logtype = $suppress ? 'suppress' : 'delete'; + + $logEntry = new ManualLogEntry( $logtype, 'delete' ); + $logEntry->setPerformer( $user ); + $logEntry->setTarget( $title ); + $logEntry->setComment( $logComment ); + $logid = $logEntry->insert(); + $logEntry->publish( $logid ); } } else { $status = Status::newFatal( 'cannotdelete',