Skin: Account for User::newFromName returning false
authorGilles Dubuc <gdubuc@wikimedia.org>
Fri, 3 Apr 2015 12:11:26 +0000 (14:11 +0200)
committerKrinkle <krinklemail@gmail.com>
Fri, 3 Apr 2015 12:21:29 +0000 (12:21 +0000)
Follows-up e41f5a07f893cf.

Bug: T92357
Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a

includes/skins/Skin.php

index 600a942..dc25c6c 100644 (file)
@@ -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;