Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179969
Change subject: LocalUserMergeJob: Don't continually create User objects for
the same user
......................................................................
LocalUserMergeJob: Don't continually create User objects for the same user
Change-Id: I705cb919cd6aad2d3d9b764b9ce492f3d6846bd5
---
M includes/LocalRenameJob/LocalUserMergeJob.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/69/179969/1
diff --git a/includes/LocalRenameJob/LocalUserMergeJob.php
b/includes/LocalRenameJob/LocalUserMergeJob.php
index 806f386..e197a7f 100644
--- a/includes/LocalRenameJob/LocalUserMergeJob.php
+++ b/includes/LocalRenameJob/LocalUserMergeJob.php
@@ -23,14 +23,14 @@
$this->updateStatus( 'inprogress' );
- $this->maybeCreateNewUser( $to );
+ $toUser = $this->maybeCreateNewUser( $to );
$renamingUser = $this->getRenameUser();
foreach ( $from as $olduser ) {
// Merge the users in order
$um = new MergeUser(
User::newFromName( $olduser ),
- User::newFromName( $to ),
+ $toUser,
new UserMergeNoopLogger()
);
$um->merge( $renamingUser );
@@ -55,6 +55,7 @@
* then merge into it.
*
* @param string $newName
+ * @return User
* @throws MWException
*/
private function maybeCreateNewUser( $newName ) {
@@ -62,7 +63,7 @@
$user = User::newFromName( $newName );
if ( $user->getId() ) {
// User already exists, nothing to do.
- return;
+ return $user;
}
// Logic from CentralAuthHooks::attemptAddUser
@@ -74,6 +75,7 @@
}
$wgAuth->initUser( $user, true );
wfRunHooks( 'AuthPluginAutoCreate', array( $user ) );
+ return $user;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/179969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I705cb919cd6aad2d3d9b764b9ce492f3d6846bd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
