| Index: trunk/phase3/includes/User.php |
| — | — | @@ -836,6 +836,11 @@ |
| 837 | 837 | $this->mBlockedby = 0; |
| 838 | 838 | $ip = wfGetIP(); |
| 839 | 839 | |
| | 840 | + if ($this->isAllowed( 'ipblock-exempt' ) ) { |
| | 841 | + # Exempt from all types of IP-block |
| | 842 | + $ip = ''; |
| | 843 | + } |
| | 844 | + |
| 840 | 845 | # User/IP blocking |
| 841 | 846 | $this->mBlock = new Block(); |
| 842 | 847 | $this->mBlock->fromMaster( !$bFromSlave ); |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -126,12 +126,6 @@ |
| 127 | 127 | if ( $this->loadFromResult( $res, $killExpired ) ) { |
| 128 | 128 | return true; |
| 129 | 129 | } |
| 130 | | - |
| 131 | | - $userObject = User::newFromId($user); |
| 132 | | - |
| 133 | | - if ($userObject->isAllowed('ipblock-exempt') ) { |
| 134 | | - $address = ''; |
| 135 | | - } |
| 136 | 130 | } |
| 137 | 131 | |
| 138 | 132 | # Try IP block |