| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1116,7 +1116,10 @@ |
| 1117 | 1117 | $this->mAllowUsertalk = 0; |
| 1118 | 1118 | |
| 1119 | 1119 | # Check if we are looking at an IP or a logged-in user |
| 1120 | | - if ( $this->isIP( $this->getName() ) ) { |
| | 1120 | + if ( $this->isAllowed( 'ipblock-exempt' ) ) { |
| | 1121 | + # Exempt from all types of IP-block |
| | 1122 | + $ip = ''; |
| | 1123 | + } elseif ( $this->isIP( $this->getName() ) ) { |
| 1121 | 1124 | $ip = $this->getName(); |
| 1122 | 1125 | } else { |
| 1123 | 1126 | # Check if we are looking at the current user |
| — | — | @@ -1130,11 +1133,6 @@ |
| 1131 | 1134 | } |
| 1132 | 1135 | } |
| 1133 | 1136 | |
| 1134 | | - if ( $this->isAllowed( 'ipblock-exempt' ) ) { |
| 1135 | | - # Exempt from all types of IP-block |
| 1136 | | - $ip = ''; |
| 1137 | | - } |
| 1138 | | - |
| 1139 | 1137 | # User/IP blocking |
| 1140 | 1138 | $this->mBlock = new Block(); |
| 1141 | 1139 | $this->mBlock->fromMaster( !$bFromSlave ); |