jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325566 )
Change subject: Don't force loading of groups and options on
User::loadFromUserObject
......................................................................
Don't force loading of groups and options on User::loadFromUserObject
When copying state from one User object to another, don't force
the source object to be initialized. The target object can initialize
groups and options on demand as usual.
Among other things, this helps to avoid some cases of recursive calls
to User::load(), see I6d1b9fe0789b4.
Bug: T142295
Bug: T137051
Change-Id: Ib369cf5b00628550591c2ee5dcb195db7c59a59c
(cherry picked from commit 6f61893400acb047b608297ebf320aa18c71e2ff)
---
M includes/user/User.php
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/user/User.php b/includes/user/User.php
index 75d5581..6c6404b 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1355,8 +1355,6 @@
*/
protected function loadFromUserObject( $user ) {
$user->load();
- $user->loadGroups();
- $user->loadOptions();
foreach ( self::$mCacheVars as $var ) {
$this->$var = $user->$var;
}
--
To view, visit https://gerrit.wikimedia.org/r/325566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib369cf5b00628550591c2ee5dcb195db7c59a59c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
