From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 22 Aug 2007 16:25:07 +0000 (+0000)
Subject: Revert r25047 -- produces confusing, useless behavior when going to Special:Upload... 
X-Git-Tag: 1.31.0-rc.0~51688
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=c96d06160bba084fc8a9aae01f509726197ba714;p=lhc%2Fweb%2Fwiklou.git

Revert r25047 -- produces confusing, useless behavior when going to Special:Upload instead of displaying the useful message that you have to enable uploads.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 83773fd304..7e8ab52070 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -185,8 +185,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 9002) Provide a "view/restore deleted edits" link on Special:Upload
   when a destination filename is provided that corresponds with previous
   deleted files
-* (bug 11023) Don't register Special:Upload as a special page when uploads are
-  disabled
 * Make the "invalid special page" message clearer
 
 == Bugfixes since 1.10 ==
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 1e83260a59..89fd15bb78 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -84,6 +84,7 @@ class SpecialPage
 		'Watchlist'                 => array( 'SpecialPage', 'Watchlist' ),
 
 		'Recentchanges'             => array( 'IncludableSpecialPage', 'Recentchanges' ),
+		'Upload'                    => array( 'SpecialPage', 'Upload' ),
 		'Imagelist'                 => array( 'SpecialPage', 'Imagelist' ),
 		'Newimages'                 => array( 'IncludableSpecialPage', 'Newimages' ),
 		'Listusers'                 => array( 'SpecialPage', 'Listusers' ),
@@ -159,7 +160,7 @@ class SpecialPage
 	 */
 	static function initList() {
 		global $wgSpecialPages;
-		global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication, $wgEnableUploads;
+		global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication;
 
 		if ( self::$mListInitialised ) {
 			return;
@@ -181,10 +182,6 @@ class SpecialPage
 			self::$mList['Confirmemail'] = 'EmailConfirmation';
 		}
 
-		if( $wgEnableUploads ) {
-			self::$mList['Upload'] = array( 'SpecialPage', 'Upload' );
-		}
-
 		# Add extension special pages
 		self::$mList = array_merge( self::$mList, $wgSpecialPages );