BUG#236 Log deletion of old image revisions.

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index f1d8b1a..49251f1 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -172,7 +172,7 @@ class ImagePage extends Article {
        {
                global $wgOut, $wgUser, $wgLang, $wgRequest;
                global $wgUseSquid, $wgInternalServer, $wgDeferredUpdateList;
-               $fname = 'Article::doDelete';
+               $fname = 'ImagePage::doDelete';
 
                $reason = $wgRequest->getVal( 'wpReason' );
                $image = $wgRequest->getVal( 'image' );
@@ -258,8 +258,12 @@ class ImagePage extends Article {
 
                $name = substr( $oldimage, 15 );
                $archive = wfImageArchiveDir( $name );
-               if ( ! unlink( "{$archive}/{$oldimage}" ) ) {
+               if ( ! @unlink( "{$archive}/{$oldimage}" ) ) {
                        $wgOut->fileDeleteError( "{$archive}/{$oldimage}" );
+               } else {
+                       # Log the deletion
+                       $log = new LogPage( 'delete' );
+                       $log->addEntry( 'delete', $this->mTitle, wfMsg('deletedrevision',$oldimage) );
                }
        }
 

diff --git a/languages/Language.php b/languages/Language.php
index bd5c03a..594544f 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1520,7 +1520,10 @@ ta[\'ca-nstab-mediawiki\'] = new Array(\'c\',\'View the system message\');
 ta[\'ca-nstab-template\'] = new Array(\'c\',\'View the template\');
 ta[\'ca-nstab-help\'] = new Array(\'c\',\'View the help page\');
 ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
-'
+',
+
+# image deletion
+'deletedrevision' => 'Deleted old revision $1.',
 
 
 );