From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 10 May 2016 19:37:46 +0000 (+0100)
Subject: resourceloader: Remove false return from Context::getUserObj()
X-Git-Tag: 1.31.0-rc.0~7009^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=b41c583e7c5d74faf6ecd838d0a4ee3f4d01066f;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Remove false return from Context::getUserObj()

Most code paths already wrongly assume this behaviour.

This patch removes the now-redundant check from the two modules
that did account for it.

Change-Id: Ic85258f184db8aa68e19d8e667e396d08ee5de0c
---

diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index 8e0239a530..85fc53d600 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -227,15 +227,17 @@ class ResourceLoaderContext {
 	 * Get the possibly-cached User object for the specified username
 	 *
 	 * @since 1.25
-	 * @return User|bool false if a valid object cannot be created
+	 * @return User
 	 */
 	public function getUserObj() {
 		if ( $this->userObj === null ) {
 			$username = $this->getUser();
 			if ( $username ) {
-				$this->userObj = User::newFromName( $username );
+				// Use provided username if valid, fallback to anonymous user
+				$this->userObj = User::newFromName( $username ) ?: new User;
 			} else {
-				$this->userObj = new User; // Anonymous user
+				// Anonymous user
+				$this->userObj = new User;
 			}
 		}
 
diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index e2a8e410c0..b225185a35 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -40,7 +40,7 @@ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule {
 		}
 
 		$user = $context->getUserObj();
-		if ( !$user || $user->isAnon() ) {
+		if ( $user->isAnon() ) {
 			return [];
 		}
 
diff --git a/includes/resourceloader/ResourceLoaderUserModule.php b/includes/resourceloader/ResourceLoaderUserModule.php
index d584165a97..c38f8d8df7 100644
--- a/includes/resourceloader/ResourceLoaderUserModule.php
+++ b/includes/resourceloader/ResourceLoaderUserModule.php
@@ -43,7 +43,7 @@ class ResourceLoaderUserModule extends ResourceLoaderWikiModule {
 		}
 
 		$user = $context->getUserObj();
-		if ( !$user || $user->isAnon() ) {
+		if ( $user->isAnon() ) {
 			return [];
 		}