jenkins-bot has submitted this change and it was merged.
Change subject: Cache a variable locally before it is reset on the instance
......................................................................
Cache a variable locally before it is reset on the instance
storeGlobalData calls resetState, which unsets $this->mHomeWiki
Bug: 46301
Change-Id: Idf690c76a1f65066c75851a9c7ae420021d289b6
---
M CentralAuthUser.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Spage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuthUser.php b/CentralAuthUser.php
index 8276931..44dc371 100644
--- a/CentralAuthUser.php
+++ b/CentralAuthUser.php
@@ -812,6 +812,8 @@
$attach = $this->prepareMigration( $migrationSet, $passwords );
+ // storeGlobalData clears $this->mHomeWiki
+ $homeWiki = $this->mHomeWiki;
$ok = $this->storeGlobalData(
$home['id'],
$home['password'],
@@ -830,7 +832,7 @@
} else {
if ( count( $migrationSet ) == 1 ) {
wfDebugLog( 'CentralAuth',
- "Singleton migration for '$this->mName'
on " . $this->mHomeWiki );
+ "Singleton migration for '$this->mName'
on $homeWiki" );
} else {
wfDebugLog( 'CentralAuth',
"Full automatic migration for
'$this->mName'" );
--
To view, visit https://gerrit.wikimedia.org/r/80325
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf690c76a1f65066c75851a9c7ae420021d289b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
