| Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockStatus.php |
| — | — | @@ -23,6 +23,12 @@ |
| 24 | 24 | $this->displayRestrictionError(); |
| 25 | 25 | return; |
| 26 | 26 | } |
| | 27 | + |
| | 28 | + global $wgApplyGlobalBlocks; |
| | 29 | + if (!$wgApplyGlobalBlocks) { |
| | 30 | + $this->addWikiMsg( 'globalblocking-whitelist-notapplied' ); |
| | 31 | + return; |
| | 32 | + } |
| 27 | 33 | |
| 28 | 34 | $errors = ''; |
| 29 | 35 | |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.i18n.php |
| — | — | @@ -75,6 +75,8 @@ |
| 76 | 76 | [[Special:GlobalBlockList|Click here]] to return to the global block list.', |
| 77 | 77 | |
| 78 | 78 | 'globalblocking-whitelist' => 'Local status of global blocks', |
| | 79 | + 'globalblocking-whitelist-notapplied' => 'Global blocks are not applied at this wiki, |
| | 80 | +so the local status of global blocks is not changeable', |
| 79 | 81 | 'globalblocking-whitelist-legend' => 'Change local status', |
| 80 | 82 | 'globalblocking-whitelist-reason' => 'Reason for change:', |
| 81 | 83 | 'globalblocking-whitelist-status' => 'Local status:', |
| Index: trunk/extensions/GlobalBlocking/SpecialGlobalBlockList.php |
| — | — | @@ -170,7 +170,8 @@ |
| 171 | 171 | ')'; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | | - if( $wgUser->isAllowed( 'globalblock-whitelist' ) ) { |
| | 174 | + global $wgApplyGlobalBlocks; |
| | 175 | + if( $wgUser->isAllowed( 'globalblock-whitelist' ) && $wgApplyGlobalBlocks ) { |
| 175 | 176 | $whitelistTitle = SpecialPage::getTitleFor( "GlobalBlockStatus" ); |
| 176 | 177 | $info[] = '(' . $sk->link($whitelistTitle, |
| 177 | 178 | wfMsgExt( 'globalblocking-list-whitelist', 'parseinline' ), |