jenkins-bot has submitted this change and it was merged.
Change subject: Add UserMergeAccountFields subscriber
......................................................................
Add UserMergeAccountFields subscriber
Bug: 67771
Change-Id: I480320a471edc194e9d1239e76a4e37e4e69c771
---
M GlobalBlocking.class.php
M GlobalBlocking.php
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GlobalBlocking.class.php b/GlobalBlocking.class.php
index 87b0cff..d08011c 100644
--- a/GlobalBlocking.class.php
+++ b/GlobalBlocking.class.php
@@ -587,4 +587,10 @@
return true;
}
+
+ static function onUserMergeAccountFields( array &$updateFields ) {
+ $updateFields[] = array( 'global_block_whitelist', 'gbw_by',
'gbw_by_text' );
+
+ return true;
+ }
}
diff --git a/GlobalBlocking.php b/GlobalBlocking.php
index 356dbf7..b1a06fc 100644
--- a/GlobalBlocking.php
+++ b/GlobalBlocking.php
@@ -34,6 +34,7 @@
$wgHooks['SpecialPasswordResetOnSubmit'][] =
'GlobalBlocking::onSpecialPasswordResetOnSubmit';
$wgHooks['OtherBlockLogLink'][] = 'GlobalBlocking::getBlockLogLink';
$wgHooks['SpecialContributionsBeforeMainOutput'][] =
'GlobalBlocking::onSpecialContributionsBeforeMainOutput';
+$wgHooks['UserMergeAccountFields'][] =
'GlobalBlocking::onUserMergeAccountFields';
$wgAutoloadClasses['SpecialGlobalBlock'] = "$dir/SpecialGlobalBlock.php";
$wgSpecialPages['GlobalBlock'] = 'SpecialGlobalBlock';
--
To view, visit https://gerrit.wikimedia.org/r/146027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I480320a471edc194e9d1239e76a4e37e4e69c771
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
