From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 15 Aug 2007 19:52:28 +0000 (+0000)
Subject: (bug 10937) Distinguish overwritten files in upload log; use the `upload/overwrite... 
X-Git-Tag: 1.31.0-rc.0~51754
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=a4f87744d1c1476ba323322ba8d24b66884d5614;p=lhc%2Fweb%2Fwiklou.git

(bug 10937) Distinguish overwritten files in upload log; use the `upload/overwrite` action for these
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8c8cafa592..bb1fa5935b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -174,6 +174,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   labels for custom restriction levels
 * Show edit count in user preferences
 * Improved support for audio/video extensions
+* (bug 10937) Distinguish overwritten files in upload log
 
 == Bugfixes since 1.10 ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 80f0eb16c3..e45f8dd80a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2293,6 +2293,7 @@ $wgLogActions = array(
 	'delete/restore'    => 'undeletedarticle',
 	'delete/revision'   => 'revdelete-logentry',
 	'upload/upload'     => 'uploadedimage',
+	'upload/overwrite'	=> 'overwroteimage',
 	'upload/revert'     => 'uploadedimage',
 	'move/move'         => '1movedto2',
 	'move/move_redir'   => '1movedto2_redir',
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 44000e4900..09e3461474 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -694,6 +694,7 @@ class LocalFile extends File
 			return false;
 		}
 
+		$reupload = false;
 		if ( $timestamp === false ) {
 			$timestamp = $dbw->timestamp();
 		}
@@ -723,6 +724,8 @@ class LocalFile extends File
 		);
 
 		if( $dbw->affectedRows() == 0 ) {
+			$reupload = true;
+		
 			# Collision, this is an update of a file
 			# Insert previous contents into oldimage
 			$dbw->insertSelect( 'oldimage', 'image',
@@ -777,7 +780,8 @@ class LocalFile extends File
 
 		# Add the log entry
 		$log = new LogPage( 'upload' );
-		$log->addEntry( 'upload', $descTitle, $comment );
+		$action = $reupload ? 'overwrite' : 'upload';
+		$log->addEntry( $action, $descTitle, $comment );
 
 		if( $descTitle->exists() ) {
 			# Create a null revision
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index cd6b7d3828..fa215ffbe5 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1420,6 +1420,7 @@ If you have this image in full resolution upload this one, otherwise change the
 'uploadwarning'               => 'Upload warning',
 'savefile'                    => 'Save file',
 'uploadedimage'               => 'uploaded "[[$1]]"',
+'overwroteimage' => 'uploaded a new version of "[[$1]]"',
 'uploaddisabled'              => 'Uploads disabled',
 'uploaddisabledtext'          => 'File uploads are disabled on this wiki.',
 'uploadscripted'              => 'This file contains HTML or script code that may be erroneously be interpreted by a web browser.',