Revert r45498 "Special:Upload can now have a custom upload message instead of uploadt...

As noted on bug, this is insufficient to cover the requirements.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5a6a4cf..45f8f04 100644 (file)
--- 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 cd887ce..207f44e 100644 (file)
--- 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