| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.php |
| — | — | @@ -64,6 +64,7 @@ |
| 65 | 65 | $wgAvailableRights[] = 'globalblock'; |
| 66 | 66 | $wgAvailableRights[] = 'globalunblock'; |
| 67 | 67 | $wgAvailableRights[] = 'globalblock-whitelist'; |
| | 68 | +$wgAvailableRights[] = 'globalblock-exempt'; |
| 68 | 69 | |
| 69 | 70 | ## CONFIGURATION |
| 70 | 71 | /** |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php |
| — | — | @@ -54,7 +54,8 @@ |
| 55 | 55 | return $result = array(); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | | - if ( $user->isAllowed( 'ipblock-exempt' ) ) { |
| | 58 | + if ( $user->isAllowed( 'ipblock-exempt' ) || |
| | 59 | + $user->isAllowed( 'globalblock-exempt' ) ) { |
| 59 | 60 | // User is exempt from IP blocks. |
| 60 | 61 | return $result = array(); |
| 61 | 62 | } |
| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.i18n.php |
| — | — | @@ -118,6 +118,7 @@ |
| 119 | 119 | 'right-globalblock' => 'Make global blocks', |
| 120 | 120 | 'right-globalunblock' => 'Remove global blocks', |
| 121 | 121 | 'right-globalblock-whitelist' => 'Disable global blocks locally', |
| | 122 | + 'right-globalblock-exempt' => 'Bypass global blocks', |
| 122 | 123 | ); |
| 123 | 124 | |
| 124 | 125 | /** Message documentation (Message documentation) |