jenkins-bot has submitted this change and it was merged.
Change subject: Add UserMerge support
......................................................................
Add UserMerge support
Bug: 72204
Change-Id: Iea125dfa0f29d34dd7e727275473a49b97627fd3
---
M AntiSpoof.php
M AntiSpoofHooks.php
M SpoofUser.php
3 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
Hoo man: Looks good to me, but someone else must approve
MaxSem: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/AntiSpoof.php b/AntiSpoof.php
index a473222..fbb7fab 100644
--- a/AntiSpoof.php
+++ b/AntiSpoof.php
@@ -64,4 +64,5 @@
$wgHooks['UserCreateForm'][] = 'AntiSpoofHooks::asUserCreateFormHook';
$wgHooks['AddNewAccount'][] = 'AntiSpoofHooks::asAddNewAccountHook';
$wgHooks['RenameUserComplete'][] = 'AntiSpoofHooks::asAddRenameUserHook';
+$wgHooks['DeleteAccount'][] = 'AntiSpoofHooks::asDeleteAccount';
$wgHooks['UnitTestsList'][] = 'AntiSpoofHooks::asUnitTestsList';
\ No newline at end of file
diff --git a/AntiSpoofHooks.php b/AntiSpoofHooks.php
index 290b437..9a54eb8 100644
--- a/AntiSpoofHooks.php
+++ b/AntiSpoofHooks.php
@@ -111,6 +111,12 @@
return true;
}
+ public static function asDeleteAccount( User &$oldUser ) {
+ $spoof = new SpoofUser( $oldUser->getName() );
+ $spoof->remove();
+ return true;
+ }
+
/**
* Register tests
*
diff --git a/SpoofUser.php b/SpoofUser.php
index 64c4b0c..ed72b0c 100644
--- a/SpoofUser.php
+++ b/SpoofUser.php
@@ -147,6 +147,17 @@
}
/**
+ * Remove a user from the spoofuser table
+ */
+ public function remove() {
+ $this->getDBMaster()->delete(
+ 'spoofuser',
+ array( 'su_name' => $this->mName ),
+ __METHOD__
+ );
+ }
+
+ /**
* @return DatabaseBase
*/
protected function getDBSlave() {
--
To view, visit https://gerrit.wikimedia.org/r/167252
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea125dfa0f29d34dd7e727275473a49b97627fd3
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/AntiSpoof
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: MaxSem <[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
