| Index: trunk/phase3/includes/SpecialPage.php |
| — | — | @@ -84,7 +84,6 @@ |
| 85 | 85 | 'Watchlist' => array( 'SpecialPage', 'Watchlist' ), |
| 86 | 86 | |
| 87 | 87 | 'Recentchanges' => array( 'IncludableSpecialPage', 'Recentchanges' ), |
| 88 | | - 'Upload' => array( 'SpecialPage', 'Upload' ), |
| 89 | 88 | 'Imagelist' => array( 'SpecialPage', 'Imagelist' ), |
| 90 | 89 | 'Newimages' => array( 'IncludableSpecialPage', 'Newimages' ), |
| 91 | 90 | 'Listusers' => array( 'SpecialPage', 'Listusers' ), |
| — | — | @@ -160,7 +159,7 @@ |
| 161 | 160 | */ |
| 162 | 161 | static function initList() { |
| 163 | 162 | global $wgSpecialPages; |
| 164 | | - global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication; |
| | 163 | + global $wgDisableCounters, $wgDisableInternalSearch, $wgEmailAuthentication, $wgEnableUploads; |
| 165 | 164 | |
| 166 | 165 | if ( self::$mListInitialised ) { |
| 167 | 166 | return; |
| — | — | @@ -182,6 +181,10 @@ |
| 183 | 182 | self::$mList['Confirmemail'] = 'EmailConfirmation'; |
| 184 | 183 | } |
| 185 | 184 | |
| | 185 | + if( $wgEnableUploads ) { |
| | 186 | + self::$mList['Upload'] = array( 'SpecialPage', 'Upload' ); |
| | 187 | + } |
| | 188 | + |
| 186 | 189 | # Add extension special pages |
| 187 | 190 | self::$mList = array_merge( self::$mList, $wgSpecialPages ); |
| 188 | 191 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -185,6 +185,8 @@ |
| 186 | 186 | * (bug 9002) Provide a "view/restore deleted edits" link on Special:Upload |
| 187 | 187 | when a destination filename is provided that corresponds with previous |
| 188 | 188 | deleted files |
| | 189 | +* (bug 11023) Don't register Special:Upload as a special page when uploads are |
| | 190 | + disabled |
| 189 | 191 | |
| 190 | 192 | == Bugfixes since 1.10 == |
| 191 | 193 | |