From: Michał Roszka <michal@roszka.pl>
Date: Thu, 20 Aug 2015 06:20:30 +0000 (+0200)
Subject: Use User::equals() where applicable in the class
X-Git-Tag: 1.31.0-rc.0~9975^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=5668f2347a65dda85fca5addd7cfc5f61db14717;p=lhc%2Fweb%2Fwiklou.git

Use User::equals() where applicable in the class

It is a minor cleanup operation. I replaced a comparison of user 'mId'
with a corresponding 'User::equals()' call.

Change-Id: I89dea55789f343e794429c38934c263168ef608d
---

diff --git a/includes/User.php b/includes/User.php
index 9b958f42dd..fddceab31d 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1591,7 +1591,7 @@ class User implements IDBAccessObject {
 		# We only need to worry about passing the IP address to the Block generator if the
 		# user is not immune to autoblocks/hardblocks, and they are the current user so we
 		# know which IP address they're actually coming from
-		if ( !$this->isAllowed( 'ipblock-exempt' ) && $this->getID() == $wgUser->getID() ) {
+		if ( !$this->isAllowed( 'ipblock-exempt' ) && $this->equals( $wgUser ) ) {
 			$ip = $this->getRequest()->getIP();
 		} else {
 			$ip = null;