Wikinaut has uploaded a new change for review.
https://gerrit.wikimedia.org/r/66139
Change subject: (bug 44917) Merging users fails to merge edit counts
......................................................................
(bug 44917) Merging users fails to merge edit counts
Change-Id: Ic837e2f84ad793d6f48b508d16919332812be6ac
---
M UserMerge.i18n.php
M UserMerge_body.php
2 files changed, 17 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/39/66139/5
diff --git a/UserMerge.i18n.php b/UserMerge.i18n.php
index 3973b21..fee3d1b 100644
--- a/UserMerge.i18n.php
+++ b/UserMerge.i18n.php
@@ -35,7 +35,7 @@
'right-usermerge' => 'Merge users',
'action-usermerge' => 'merge users',
'usermerge-editcount' => 'Add edit count?',
- 'usermerge-editcount-success' => 'Adding edit count of ($1 and $2)',
+ 'usermerge-editcount-success' => 'Adding $1 edit counts of user $2 to
$3 edit counts of user $4 ($5 edit counts after merging)',
'usermerge-autopagedelete' => 'Automatically deleted when merging
users',
'usermerge-page-unmoved' => 'The page $1 could not be moved to
$2.',
'usermerge-page-moved' => 'The page $1 has been moved to $2.',
diff --git a/UserMerge_body.php b/UserMerge_body.php
index 10a0167..c3c65e6 100644
--- a/UserMerge_body.php
+++ b/UserMerge_body.php
@@ -181,7 +181,7 @@
$dbw = wfGetDB( DB_MASTER );
$dbw->delete( 'user_groups', array( 'ug_user' => $olduserID ) );
$dbw->delete( 'user', array( 'user_id' => $olduserID ) );
- $this->getOutput()->addHTML( $this->msg(
'usermerge-userdeleted', $olduser_text, $olduserID )->escaped() );
+ $this->getOutput()->addHTML( $this->msg(
'usermerge-userdeleted', $olduser_text, $olduserID )->escaped() . "<br />\n" );
$log = new LogPage( 'usermerge' );
$log->addEntry( 'deleteuser', $this->getUser()->getUserPage(),
'', array( $olduser_text, $olduserID ) );
@@ -277,27 +277,21 @@
private function mergeEditcount( $newuserID, $olduserID ) {
$dbw = wfGetDB( DB_MASTER );
- # old user edit count
- $result = $dbw->selectField( 'user',
- 'user_editcount',
- array( 'user_id' => $olduserID ),
- __METHOD__
+ $olduserEdits = $dbw->selectField(
+ 'user',
+ 'user_editcount',
+ array( 'user_id' => $olduserID ),
+ __METHOD__
);
- $row = $dbw->fetchRow( $result );
- $oldEdits = $row[0];
-
- # new user edit count
- $result = $dbw->selectField( 'user',
- 'user_editcount',
- array( 'user_id' => $newuserID ),
- __METHOD__
+ $newuserEdits = $dbw->selectField(
+ 'user',
+ 'user_editcount',
+ array( 'user_id' => $newuserID ),
+ __METHOD__
);
- $row = $dbw->fetchRow( $result );
- $newEdits = $row[0];
- # add edits
- $totalEdits = $oldEdits + $newEdits;
+ $totalEdits = $olduserEdits + $newuserEdits;
# don't run querys if neither user has any edits
if ( $totalEdits > 0 ) {
@@ -316,7 +310,10 @@
);
}
- $this->getOutput()->addHTML( $this->msg(
'usermerge-editcount-success', $olduserID, $newuserID )->escaped() . "<br />\n"
);
+ $this->getOutput()->addHTML( $this->msg(
'usermerge-editcount-success',
+ $olduserEdits, $olduserID, $newuserEdits, $newuserID,
$totalEdits
+ )->escaped() . "<br />\n"
+ );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/66139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic837e2f84ad793d6f48b508d16919332812be6ac
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
