jenkins-bot has submitted this change and it was merged.
Change subject: Add UserMergeAccountFields subscriber
......................................................................
Add UserMergeAccountFields subscriber
Bug: 67762
Change-Id: I35caa900a054d760ae897d5803ebcf842555c3f1
---
M CheckUser.hooks.php
M CheckUser.php
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CheckUser.hooks.php b/CheckUser.hooks.php
index c2d0670..a0ebf58 100644
--- a/CheckUser.hooks.php
+++ b/CheckUser.hooks.php
@@ -406,4 +406,12 @@
return false; // autoblock handled
}
+
+ public static function onUserMergeAccountFields( array &$updateFields )
{
+ $updateFields[] = array( 'cu_changes', 'cuc_user',
'cuc_user_text' );
+ $updateFields[] = array( 'cu_log', 'cul_user', 'cul_user_text'
);
+ $updateFields[] = array( 'cu_log', 'cul_target_id' );
+
+ return true;
+ }
}
diff --git a/CheckUser.php b/CheckUser.php
index 7dd8df7..2d3532f 100644
--- a/CheckUser.php
+++ b/CheckUser.php
@@ -78,6 +78,7 @@
$wgHooks['User::mailPasswordInternal'][] =
'CheckUserHooks::updateCUPasswordResetData';
$wgHooks['AuthPluginAutoCreate'][] = 'CheckUserHooks::onAuthPluginAutoCreate';
$wgHooks['AddNewAccount'][] = 'CheckUserHooks::onAddNewAccount';
+$wgHooks['UserMergeAccountFields'][] =
'CheckUserHooks::onUserMergeAccountFields';
# Occasional pruning of CU data
$wgHooks['ArticleEditUpdatesDeleteFromRecentchanges'][] =
'CheckUserHooks::maybePruneIPData';
--
To view, visit https://gerrit.wikimedia.org/r/146032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35caa900a054d760ae897d5803ebcf842555c3f1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CheckUser
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[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
