Skin: Account for User::newFromName returning false

[lhc/web/wiklou.git] / includes / skins / Skin.php

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 600a942..dc25c6c 100644 (file)
--- 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;