jenkins-bot has submitted this change and it was merged.
Change subject: Return a master instance from our implementation of
AuthPlugin::getUserInstance()
......................................................................
Return a master instance from our implementation of
AuthPlugin::getUserInstance()
We don't know if the caller is going to call write methods like
AuthPluginUser::resetAuthToken(), so to be safe we need to return a
master instance here.
Bug: T135954
Change-Id: Ic2a6c2a684f4787603ab13310e6b40c6471e3cd6
(cherry picked from commit 4e073996a69894da17ed2181ad473ceaf0f4fe07)
---
M includes/CentralAuthPlugin.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CentralAuthPlugin.php b/includes/CentralAuthPlugin.php
index e8a959f..937576d 100644
--- a/includes/CentralAuthPlugin.php
+++ b/includes/CentralAuthPlugin.php
@@ -364,7 +364,9 @@
* @return CentralAuthUser
*/
public function getUserInstance( User &$user ) {
- return CentralAuthUser::getInstance( $user );
+ // Needs to be a master instance because we don't know if the
caller is
+ // going to call write methods like
AuthPluginUser::resetAuthToken().
+ return CentralAuthUser::getMasterInstance( $user );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/296558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2a6c2a684f4787603ab13310e6b40c6471e3cd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: REL1_27
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
