UserMerge_body.php_GitDiff
Public
Actions

Authored By

	• bzimport
	Nov 22 2014, 1:21 AM

Size

1 KB

Referenced Files

None

Subscribers

None

UserMerge_body.php_GitDiff
View Options

	diff --git a/UserMerge_body.php b/UserMerge_body.php
	index 10a0167..0fe8624 100644
	--- a/UserMerge_body.php
	+++ b/UserMerge_body.php
	@@ -278,23 +278,20 @@ class UserMerge extends SpecialPage {
	$dbw = wfGetDB( DB_MASTER );

	# old user edit count
	- $result = $dbw->selectField( 'user',
	- 'user_editcount',
	- array( 'user_id' => $olduserID ),
	- __METHOD__
	+ $oldEdits = $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__
	+ $newEdits = $dbw->selectField(
	+ 'user',
	+ 'user_editcount',
	+ array( 'user_id' => $newuserID ),
	+ __METHOD__
	);
	- $row = $dbw->fetchRow( $result );
	- $newEdits = $row[0];

	# add edits
	$totalEdits = $oldEdits + $newEdits;
	@@ -316,7 +313,7 @@ class UserMerge extends SpecialPage {
	);
	}

	- $this->getOutput()->addHTML( $this->msg( 'usermerge-editcount-success', $olduserID, $newuserID )->escaped() . "<br />\n" );
	+ $this->getOutput()->addHTML( $this->msg( 'usermerge-editcount-success', $oldEdits, $newEdits )->escaped() . "<br />\n" );

	return true;
	}