Well there was no problem in the first place. Nice work Werdna

diff --git a/includes/Block.php b/includes/Block.php
index 644fd9c..ff813ba 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -126,12 +126,6 @@ class Block
                        if ( $this->loadFromResult( $res, $killExpired ) ) {
                                return true;
                        }
-
-                       $userObject = User::newFromId($user);
-
-                       if ($userObject->isAllowed('ipblock-exempt') ) {
-                               $address = '';
-                       }
                }
 
                # Try IP block

diff --git a/includes/User.php b/includes/User.php
index c66c2d7..44dada4 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -836,6 +836,11 @@ class User {
                $this->mBlockedby = 0;
                $ip = wfGetIP();
 
+               if ($this->isAllowed( 'ipblock-exempt' ) ) {
+                       # Exempt from all types of IP-block
+                       $ip = '';
+               }
+
                # User/IP blocking
                $this->mBlock = new Block();
                $this->mBlock->fromMaster( !$bFromSlave );