From: Rotem Liss <rotem@users.mediawiki.org>
Date: Thu, 27 Dec 2007 17:04:17 +0000 (+0000)
Subject: 'Special-case optimization' seems to be already included in User::getId, in a smarter... 
X-Git-Tag: 1.31.0-rc.0~50259
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=405c1c356c15633e070ca0dc6bf5bde6f436d201;p=lhc%2Fweb%2Fwiklou.git

'Special-case optimization' seems to be already included in User::getId, in a smarter way; it shouldn't be done in User::isLoggedIn too.
---

diff --git a/includes/SpecialUserrights.php b/includes/SpecialUserrights.php
index c5ab9655ba..a2d78c7096 100644
--- a/includes/SpecialUserrights.php
+++ b/includes/SpecialUserrights.php
@@ -208,7 +208,7 @@ class UserrightsForm extends HTMLForm {
 			$user = UserRightsProxy::newFromName( $database, $name );
 		}
 		
-		if( !$user || $user->getId() == 0 ) {
+		if( !$user || $user->isAnon() ) {
 			$wgOut->addWikiText( wfMsg( 'nosuchusershort', wfEscapeWikiText( $username ) ) );
 			return null;
 		}
diff --git a/includes/User.php b/includes/User.php
index c22ed5fe9d..756355a3d6 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1729,13 +1729,8 @@ class User {
 	 * Returns true if the user is not an anonymous visitor.
 	 *
 	 * @return bool
-	 * @fixme "special-case optimization" may fail for an object referring to a user that doesn't exist in the system.
 	 */
 	function isLoggedIn() {
-		if( $this->mId === null and $this->mName !== null ) {
-			// Special-case optimization
-			return !self::isIP( $this->mName );
-		}
 		return $this->getID() != 0;
 	}