Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/201698

Change subject: Account for User::newFromName returning false
......................................................................

Account for User::newFromName returning false

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


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/98/201698/1

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 600a942..dc25c6c 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -339,9 +339,13 @@
                                $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;

-- 
To view, visit https://gerrit.wikimedia.org/r/201698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to