From 4ea5e0340c60aad92fcf9e16e279045af313ab1f Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 1 Jul 2012 22:09:11 +0200 Subject: [PATCH] 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 --- includes/FileDeleteForm.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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', -- 2.20.1