From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 27 Jan 2009 22:41:08 +0000 (+0000)
Subject: Revert r45498 "Special:Upload can now have a custom upload message instead of uploadt... 
X-Git-Tag: 1.31.0-rc.0~43199
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=c007b369770b00c6f3ed1d8c4de4372da7f75337;p=lhc%2Fweb%2Fwiklou.git

Revert r45498 "Special:Upload can now have a custom upload message instead of uploadtext by passing "uploadmsg" parameter in the url. ... This should fix the Commons "uselang" hack on for Special:Upload."
As noted on bug, this is insufficient to cover the requirements.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5a6a4cf69a..45f8f04c8f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -29,8 +29,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 === New features in 1.15 ===
 
 * (bug 2242) Add an expiry time to temporary passwords
-* Special:Upload can now have a custom upload message instead of uploadtext by
-  passing "uploadmsg" parameter in the url
 * (bug 9947) Add PROTECTIONLEVEL parser function to return the protection level
   for the current page for a given action
 * (bug 17002) Add &minor= and &summary= as parameters in the url when editing,
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index cd887ce734..207f44e8c2 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1006,19 +1006,8 @@ wgUploadAutoFill = {$autofill};
 			$wgOut->addHTML( "<h2>{$sub}</h2>\n" .
 			  "<span class='error'>{$msg}</span>\n" );
 		}
-
-		$uploadMsg = $wgRequest->getVal( 'uploadmsg' );
-		if( $uploadMsg ) {
-			$uploadMsgName = 'uploadtext-' . $uploadMsg;
-			// Fall back to normal message if the custom messages is empty
-			if( wfEmptyMsg( $uploadMsgName, wfMsg( $uploadMsgName ) ) )
-				$uploadMsgName = 'uploadtext';
-		} else {
-			$uploadMsgName = 'uploadtext';
-		}
-
 		$wgOut->addHTML( '<div id="uploadtext">' );
-		$wgOut->addWikiMsg( $uploadMsgName, $this->mDesiredDestName );
+		$wgOut->addWikiMsg( 'uploadtext', $this->mDesiredDestName );
 		$wgOut->addHTML( "</div>\n" );
 
 		# Print a list of allowed file extensions, if so configured.  We ignore