From 77e51f50e7ef8796fc6219e4d002fe8b3a56e14c Mon Sep 17 00:00:00 2001 From: Bryan Davis Date: Tue, 23 Feb 2016 10:43:01 -0700 Subject: [PATCH] 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 --- includes/resourceloader/ResourceLoaderContext.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index bf5ae4b647..6458e71e7e 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -221,13 +221,7 @@ class ResourceLoaderContext { 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 } -- 2.20.1