From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 13 May 2008 17:40:56 +0000 (+0000)
Subject: * (bug 14111) Similar filename warning links now lead to correct page
X-Git-Tag: 1.31.0-rc.0~47663
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=a4f9b72a6290714938706b9f819a978440afacf4;p=lhc%2Fweb%2Fwiklou.git

* (bug 14111) Similar filename warning links now lead to correct page
A title object was getting created without the Image namespace, so lead to wrong links when used in fileexists-extension warning message. For consistency, using target name with namespace in both spots on that message now as well.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3e732d74f1..fa164f7c7a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -271,6 +271,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13943) Fix image redirect behaviour on image pages
 * (bug 14093) Do 'sysop' => 'protect' magic in Title::isValidMoveOperation
 * (bug 14063) Power search form missing <label> for redirects check
+* (bug 14111) Similar filename warning links now lead to correct page
+
 
 === API changes in 1.13 ===
 
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index f86efe1ca9..e00030bde6 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -596,7 +596,7 @@ class UploadForm {
 			// extensions (eg 'jpg' rather than 'JPEG').
 			//
 			// Check for another file using the normalized form...
-			$nt_lc = Title::newFromText( $partname . '.' . $file->getExtension() );
+			$nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() );
 			$file_lc = wfLocalFile( $nt_lc );
 		} else {
 			$file_lc = false;
@@ -635,7 +635,10 @@ class UploadForm {
 				$dlink2 = '';
 			}
 
-			$warning .= '<li>' . wfMsgExt( 'fileexists-extension', 'parsemag', $file->getName(), $dlink ) . '</li>' . $dlink2;
+			$warning .= '<li>' .
+				wfMsgExt( 'fileexists-extension', 'parsemag',
+					$file->getTitle()->getPrefixedText(), $dlink ) .
+				'</li>' . $dlink2;
 
 		} elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr( $partname , 2, 3 ) == 'px-' )
 			&& ereg( "[0-9]{2}" , substr( $partname , 0, 2) ) )