Okay brion, this patch actually /works/. Thanks to the miracles of testing, I can...

diff --git a/includes/Block.php b/includes/Block.php
index ff813ba..644fd9c 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -126,6 +126,12 @@ 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 079e103..c66c2d7 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -836,15 +836,10 @@ class User {
                $this->mBlockedby = 0;
                $ip = wfGetIP();
 
-               if (!$this->isAllowed( 'ipblock-exempt' ) ) {
-                       # Check for IP blocks - ipblock-exempt is exempt from all types of IP block.
-                       $check_ip = $ip;
-               }
-
                # User/IP blocking
                $this->mBlock = new Block();
                $this->mBlock->fromMaster( !$bFromSlave );
-               if ( $this->mBlock->load( $check_ip , $this->mId ) ) {
+               if ( $this->mBlock->load( $ip , $this->mId ) ) {
                        wfDebug( __METHOD__.": Found block.\n" );
                        $this->mBlockedby = $this->mBlock->mBy;
                        $this->mBlockreason = $this->mBlock->mReason;
@@ -860,14 +855,14 @@ class User {
                if ( !$this->isAllowed('proxyunbannable') && !in_array( $ip, $wgProxyWhitelist ) ) {
 
                        # Local list
-                       if ( wfIsLocallyBlockedProxy( $check_ip ) ) {
+                       if ( wfIsLocallyBlockedProxy( $ip ) ) {
                                $this->mBlockedby = wfMsg( 'proxyblocker' );
                                $this->mBlockreason = wfMsg( 'proxyblockreason' );
                        }
 
                        # DNSBL
                        if ( !$this->mBlockedby && $wgEnableSorbs && !$this->getID() ) {
-                               if ( $this->inSorbsBlacklist( $check_ip ) ) {
+                               if ( $this->inSorbsBlacklist( $ip ) ) {
                                        $this->mBlockedby = wfMsg( 'sorbs' );
                                        $this->mBlockreason = wfMsg( 'sorbsreason' );
                                }