jenkins-bot has submitted this change and it was merged.
Change subject: Skin: Account for User::newFromName returning false
......................................................................
Skin: Account for User::newFromName returning false
Follows-up e41f5a07f893cf.
Bug: T92357
Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
---
M includes/skins/Skin.php
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
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: merged
Gerrit-Change-Id: I00edfaed92af7d16894453f28999bfce2de2e37a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
