jenkins-bot has submitted this change and it was merged.
Change subject: resourceloader: Remove $wgUser optimization that uses session
......................................................................
resourceloader: Remove $wgUser optimization that uses session
Remove optimization that avoids unstubbing $wgUser because $wgUser
is not a plain object for the current user name.
It's a stub with mFrom='session' until methods are called that need
the info, such as getName(), which then lazy loads the object based on
the session information.
We want to make load.php session-less.
Bug: T127233
Change-Id: Ica482e5d1892cb29456e6f2a91cd70017cf414c5
---
M includes/resourceloader/ResourceLoaderContext.php
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/resourceloader/ResourceLoaderContext.php
b/includes/resourceloader/ResourceLoaderContext.php
index bf5ae4b..6458e71 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -221,13 +221,7 @@
if ( $this->userObj === null ) {
$username = $this->getUser();
if ( $username ) {
- // Optimize: Avoid loading a new User object if
possible
- global $wgUser;
- if ( is_object( $wgUser ) && $wgUser->getName()
=== $username ) {
- $this->userObj = $wgUser;
- } else {
- $this->userObj = User::newFromName(
$username );
- }
+ $this->userObj = User::newFromName( $username );
} else {
$this->userObj = new User; // Anonymous user
}
--
To view, visit https://gerrit.wikimedia.org/r/272798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ica482e5d1892cb29456e6f2a91cd70017cf414c5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
