From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- maintenance/reassignEdits.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'maintenance/reassignEdits.php') diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 3830fe38..a91abf93 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -17,13 +17,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * + * @file * @ingroup Maintenance * @author Rob Church * @licence GNU General Public Licence 2.0 or later */ -require_once( dirname( __FILE__ ) . '/Maintenance.php' ); +require_once( __DIR__ . '/Maintenance.php' ); +/** + * Maintenance script that reassigns edits from a user or IP address + * to another user. + * + * @ingroup Maintenance + */ class ReassignEdits extends Maintenance { public function __construct() { parent::__construct(); @@ -62,13 +69,13 @@ class ReassignEdits extends Maintenance { * * @param $from User to take edits from * @param $to User to assign edits to - * @param $rc Update the recent changes table - * @param $report Don't change things; just echo numbers + * @param $rc bool Update the recent changes table + * @param $report bool Don't change things; just echo numbers * @return integer Number of entries changed, or that would be changed */ private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) { $dbw = wfGetDB( DB_MASTER ); - $dbw->begin(); + $dbw->begin( __METHOD__ ); # Count things $this->output( "Checking current edits..." ); @@ -117,7 +124,7 @@ class ReassignEdits extends Maintenance { } } - $dbw->commit(); + $dbw->commit( __METHOD__ ); return (int)$total; } @@ -150,7 +157,7 @@ class ReassignEdits extends Maintenance { /** * Initialise the user object * - * @param $username Username or IP address + * @param $username string Username or IP address * @return User */ private function initialiseUser( $username ) { -- cgit v1.2.2