Don't even try to get user's IP address if he has 'ipblock-exempt' right

diff --git a/includes/User.php b/includes/User.php
index 6340815..4ae4042 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1116,7 +1116,10 @@ class User {
                $this->mAllowUsertalk = 0;
 
                # Check if we are looking at an IP or a logged-in user
-               if ( $this->isIP( $this->getName() ) ) {
+               if ( $this->isAllowed( 'ipblock-exempt' ) ) {
+                       # Exempt from all types of IP-block
+                       $ip = '';
+               } elseif ( $this->isIP( $this->getName() ) ) {
                        $ip = $this->getName();
                } else {
                        # Check if we are looking at the current user
@@ -1130,11 +1133,6 @@ class User {
                        }
                }
 
-               if ( $this->isAllowed( 'ipblock-exempt' ) ) {
-                       # Exempt from all types of IP-block
-                       $ip = '';
-               }
-
                # User/IP blocking
                $this->mBlock = new Block();
                $this->mBlock->fromMaster( !$bFromSlave );