jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Remove false return from Context::getUserObj()
......................................................................
resourceloader: Remove false return from Context::getUserObj()
Most code paths already wrongly assume this behaviour.
This patch removes the now-redundant check from the two modules
that did account for it.
Change-Id: Ic85258f184db8aa68e19d8e667e396d08ee5de0c
---
M includes/resourceloader/ResourceLoaderContext.php
M includes/resourceloader/ResourceLoaderUserGroupsModule.php
M includes/resourceloader/ResourceLoaderUserModule.php
3 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderContext.php
b/includes/resourceloader/ResourceLoaderContext.php
index 8e0239a..85fc53d 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -227,15 +227,17 @@
* Get the possibly-cached User object for the specified username
*
* @since 1.25
- * @return User|bool false if a valid object cannot be created
+ * @return User
*/
public function getUserObj() {
if ( $this->userObj === null ) {
$username = $this->getUser();
if ( $username ) {
- $this->userObj = User::newFromName( $username );
+ // Use provided username if valid, fallback to
anonymous user
+ $this->userObj = User::newFromName( $username )
?: new User;
} else {
- $this->userObj = new User; // Anonymous user
+ // Anonymous user
+ $this->userObj = new User;
}
}
diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
index e2a8e41..b225185 100644
--- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php
@@ -40,7 +40,7 @@
}
$user = $context->getUserObj();
- if ( !$user || $user->isAnon() ) {
+ if ( $user->isAnon() ) {
return [];
}
diff --git a/includes/resourceloader/ResourceLoaderUserModule.php
b/includes/resourceloader/ResourceLoaderUserModule.php
index d584165..c38f8d8 100644
--- a/includes/resourceloader/ResourceLoaderUserModule.php
+++ b/includes/resourceloader/ResourceLoaderUserModule.php
@@ -43,7 +43,7 @@
}
$user = $context->getUserObj();
- if ( !$user || $user->isAnon() ) {
+ if ( $user->isAnon() ) {
return [];
}
--
To view, visit https://gerrit.wikimedia.org/r/288054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic85258f184db8aa68e19d8e667e396d08ee5de0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
