From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 28 Jan 2009 02:40:14 +0000 (+0000)
Subject: Skip dupe warnings when it's a titles are the same and it's a reupload.
X-Git-Tag: 1.31.0-rc.0~43191
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=cc5db2fed5ca4ce5cfa0efaecbdafedf588bea60;p=lhc%2Fweb%2Fwiklou.git

Skip dupe warnings when it's a titles are the same and it's a reupload.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2e70162fad..d56ddd5025 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -106,6 +106,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 15391) catch DBQueryErrors on external storage insertion. This avoids error 
   messages on save were the edit in fact is saved.
 * (bug 17184) Remove duplicate "z" accesskey in MonoBook
+* Remove redundant dupe warnings on reupload for the same title. Dupe warnings
+  for identical files at different titles are still given.
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 207f44e8c2..06082786e0 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -550,7 +550,7 @@ class UploadForm {
 				$warning .= self::getExistsWarning( $this->mLocalFile );
 			}
 			
-			$warning .= $this->getDupeWarning( $this->mTempPath, $finalExt );
+			$warning .= $this->getDupeWarning( $this->mTempPath, $finalExt, $nt );
 			
 			if( $warning != '' ) {
 				/**
@@ -757,7 +757,7 @@ class UploadForm {
 	 * Check for duplicate files and throw up a warning before the upload
 	 * completes.
 	 */
-	function getDupeWarning( $tempfile, $extension ) {
+	function getDupeWarning( $tempfile, $extension, $destinationTitle ) {
 		$hash = File::sha1Base36( $tempfile );
 		$dupes = RepoGroup::singleton()->findBySha1( $hash );
 		$archivedImage = new ArchivedFile( null, 0, $hash.".$extension" );
@@ -766,8 +766,12 @@ class UploadForm {
 			$msg = "<gallery>";
 			foreach( $dupes as $file ) {
 				$title = $file->getTitle();
-				$msg .= $title->getPrefixedText() .
-					"|" . $title->getText() . "\n";
+				# Don't throw the warning when the titles are the same, it's a reupload
+				# and highly redundant.
+				if ( !$title->equals( $destinationTitle ) || !$this->mIsReUpload ) {
+					$msg .= $title->getPrefixedText() .
+						"|" . $title->getText() . "\n";
+				}
 			}
 			$msg .= "</gallery>";
 			return "<li>" .