jenkins-bot has submitted this change and it was merged.
Change subject: Add UserMerge support with UserMergeAccountFields hook
......................................................................
Add UserMerge support with UserMergeAccountFields hook
Change-Id: I2e44164635908fc3d9d97d7a84a10859f679b021
---
M Newsletter.hooks.php
M extension.json
2 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 9c86f59..1e6afb3 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -66,4 +66,16 @@
return true;
}
+ /**
+ * Tables that Extension:UserMerge needs to update
+ *
+ * @param array $updateFields
+ * @return bool
+ */
+ public static function onUserMergeAccountFields( array &$updateFields )
{
+ $updateFields[] = array( 'nl_publishers', 'nlp_publisher_id' );
+ $updateFields[] = array( 'nl_subscriptions',
'nls_subscriber_id' );
+
+ return true;
+ }
}
diff --git a/extension.json b/extension.json
index b534111..bdbe8cd 100644
--- a/extension.json
+++ b/extension.json
@@ -91,6 +91,9 @@
],
"LoginFormValidErrorMessages": [
"NewsletterHooks::onLoginFormValidErrorMessages"
+ ],
+ "UserMergeAccountFields": [
+ "NewsletterHooks::onUserMergeAccountFields"
]
},
"manifest_version": 1
--
To view, visit https://gerrit.wikimedia.org/r/248610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e44164635908fc3d9d97d7a84a10859f679b021
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
