| Index: trunk/extensions/GlobalBlocking/GlobalBlocking.class.php |
| — | — | @@ -6,6 +6,11 @@ |
| 7 | 7 | if ($action == 'read' || !$wgApplyGlobalBlocks) { |
| 8 | 8 | return true; |
| 9 | 9 | } |
| | 10 | + if ( $user->isAllowed( 'ipblock-exempt' ) || |
| | 11 | + $user->isAllowed( 'globalblock-exempt' ) ) { |
| | 12 | + // User is exempt from IP blocks. |
| | 13 | + return true; |
| | 14 | + } |
| 10 | 15 | $ip = wfGetIp(); |
| 11 | 16 | $blockError = self::getUserBlockErrors( $user, $ip ); |
| 12 | 17 | if( !empty($blockError) ) { |