From cfe4ff095c83da56b1e956381eb5d8dfb689eba3 Mon Sep 17 00:00:00 2001
From: Gilles Dubuc <gdubuc@wikimedia.org>
Date: Fri, 3 Apr 2015 14:11:26 +0200
Subject: [PATCH] Skin: Account for User::newFromName returning false

Follows-up e41f5a07f893cf.

Bug: T92357
Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
---
 includes/skins/Skin.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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;
-- 
2.20.1