From b342a81da0454cc39a2e404f7208c8cbb2eed3c6 Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Sun, 7 Jan 2007 07:57:54 +0000 Subject: [PATCH] Well there was no problem in the first place. Nice work Werdna --- includes/Block.php | 6 ------ includes/User.php | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/includes/Block.php b/includes/Block.php index 644fd9c161..ff813ba3e4 100644 --- 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 c66c2d77bc..44dada4ef6 100644 --- 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 ); -- 2.20.1