From: Gilles Dubuc <gdubuc@wikimedia.org>
Date: Fri, 3 Apr 2015 12:11:26 +0000 (+0200)
Subject: Skin: Account for User::newFromName returning false
X-Git-Tag: 1.31.0-rc.0~11858
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=cfe4ff095c83da56b1e956381eb5d8dfb689eba3;p=lhc%2Fweb%2Fwiklou.git

Skin: Account for User::newFromName returning false

Follows-up e41f5a07f893cf.

Bug: T92357
Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
---

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 600a942e6e..dc25c6cdc8 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -339,9 +339,13 @@ abstract class Skin extends ContextSource {
 				$this->mRelevantUser = User::newFromName( $rootUser, false );
 			} else {
 				$user = User::newFromName( $rootUser, false );
-				$user->load( User::READ_NORMAL );
-				if ( $user && $user->isLoggedIn() ) {
-					$this->mRelevantUser = $user;
+
+				if ( $user ) {
+					$user->load( User::READ_NORMAL );
+
+					if ( $user->isLoggedIn() ) {
+						$this->mRelevantUser = $user;
+					}
 				}
 			}
 			return $this->mRelevantUser;