| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -1006,19 +1006,8 @@ |
| 1007 | 1007 | $wgOut->addHTML( "<h2>{$sub}</h2>\n" . |
| 1008 | 1008 | "<span class='error'>{$msg}</span>\n" ); |
| 1009 | 1009 | } |
| 1010 | | - |
| 1011 | | - $uploadMsg = $wgRequest->getVal( 'uploadmsg' ); |
| 1012 | | - if( $uploadMsg ) { |
| 1013 | | - $uploadMsgName = 'uploadtext-' . $uploadMsg; |
| 1014 | | - // Fall back to normal message if the custom messages is empty |
| 1015 | | - if( wfEmptyMsg( $uploadMsgName, wfMsg( $uploadMsgName ) ) ) |
| 1016 | | - $uploadMsgName = 'uploadtext'; |
| 1017 | | - } else { |
| 1018 | | - $uploadMsgName = 'uploadtext'; |
| 1019 | | - } |
| 1020 | | - |
| 1021 | 1010 | $wgOut->addHTML( '<div id="uploadtext">' ); |
| 1022 | | - $wgOut->addWikiMsg( $uploadMsgName, $this->mDesiredDestName ); |
| | 1011 | + $wgOut->addWikiMsg( 'uploadtext', $this->mDesiredDestName ); |
| 1023 | 1012 | $wgOut->addHTML( "</div>\n" ); |
| 1024 | 1013 | |
| 1025 | 1014 | # Print a list of allowed file extensions, if so configured. We ignore |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -29,8 +29,6 @@ |
| 30 | 30 | === New features in 1.15 === |
| 31 | 31 | |
| 32 | 32 | * (bug 2242) Add an expiry time to temporary passwords |
| 33 | | -* Special:Upload can now have a custom upload message instead of uploadtext by |
| 34 | | - passing "uploadmsg" parameter in the url |
| 35 | 33 | * (bug 9947) Add PROTECTIONLEVEL parser function to return the protection level |
| 36 | 34 | for the current page for a given action |
| 37 | 35 | * (bug 17002) Add &minor= and &summary= as parameters in the url when editing, |