From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 maintenance/reassignEdits.php | 60 +++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

(limited to 'maintenance/reassignEdits.php')

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index e595e5b3..039422b3 100644
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -22,7 +22,7 @@
  * @licence GNU General Public Licence 2.0 or later
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class ReassignEdits extends Maintenance {
 	public function __construct() {
@@ -34,21 +34,22 @@ class ReassignEdits extends Maintenance {
 		$this->addArg( 'from', 'Old user to take edits from' );
 		$this->addArg( 'to', 'New user to give edits to' );
 	}
-	
+
 	public function execute() {
-		if( $this->hasArg(0) && $this->hasArg(1) ) {
+		if ( $this->hasArg( 0 ) && $this->hasArg( 1 ) ) {
 			# Set up the users involved
-			$from = $this->initialiseUser( $this->getArg(0) );
-			$to   = $this->initialiseUser( $this->getArg(1) );
-	
+			$from = $this->initialiseUser( $this->getArg( 0 ) );
+			$to   = $this->initialiseUser( $this->getArg( 1 ) );
+
 			# If the target doesn't exist, and --force is not set, stop here
-			if( $to->getId() || $this->hasOption('force') ) {
+			if ( $to->getId() || $this->hasOption( 'force' ) ) {
 				# Reassign the edits
-				$report = $this->hasOption('report');
-				$count = $this->doReassignEdits( $from, $to, !$this->hasOption('norc'), $report );
-				# If reporting, and there were items, advise the user to run without --report	
-				if( $report )
+				$report = $this->hasOption( 'report' );
+				$this->doReassignEdits( $from, $to, !$this->hasOption( 'norc' ), $report );
+				# If reporting, and there were items, advise the user to run without --report
+				if ( $report ) {
 					$this->output( "Run the script again without --report to update.\n" );
+				}
 			} else {
 				$ton = $to->getName();
 				$this->error( "User '{$ton}' not found." );
@@ -83,7 +84,7 @@ class ReassignEdits extends Maintenance {
 		$this->output( "found {$del}.\n" );
 
 		# Don't count recent changes if we're not supposed to
-		if( $rc ) {
+		if ( $rc ) {
 			$this->output( "Checking recent changes..." );
 			$res = $dbw->select( 'recentchanges', 'COUNT(*) AS count', $this->userConditions( $from, 'rc_user', 'rc_user_text' ), __METHOD__ );
 			$row = $dbw->fetchObject( $res );
@@ -92,31 +93,34 @@ class ReassignEdits extends Maintenance {
 		} else {
 			$rec = 0;
 		}
-	
+
 		$total = $cur + $del + $rec;
 		$this->output( "\nTotal entries to change: {$total}\n" );
-	
-		if( !$report ) {
-			if( $total ) {
+
+		if ( !$report ) {
+			if ( $total ) {
 				# Reassign edits
 				$this->output( "\nReassigning current edits..." );
-				$res = $dbw->update( 'revision', $this->userSpecification( $to, 'rev_user', 'rev_user_text' ), $this->userConditions( $from, 'rev_user', 'rev_user_text' ), __METHOD__ );
+				$dbw->update( 'revision', $this->userSpecification( $to, 'rev_user', 'rev_user_text' ),
+					$this->userConditions( $from, 'rev_user', 'rev_user_text' ), __METHOD__ );
 				$this->output( "done.\nReassigning deleted edits..." );
-				$res = $dbw->update( 'archive', $this->userSpecification( $to, 'ar_user', 'ar_user_text' ), $this->userConditions( $from, 'ar_user', 'ar_user_text' ), __METHOD__ );
+				$dbw->update( 'archive', $this->userSpecification( $to, 'ar_user', 'ar_user_text' ),
+					$this->userConditions( $from, 'ar_user', 'ar_user_text' ), __METHOD__ );
 				$this->output( "done.\n" );
 				# Update recent changes if required
-				if( $rc ) {
+				if ( $rc ) {
 					$this->output( "Updating recent changes..." );
-					$res = $dbw->update( 'recentchanges', $this->userSpecification( $to, 'rc_user', 'rc_user_text' ), $this->userConditions( $from, 'rc_user', 'rc_user_text' ), __METHOD__ );
+					$dbw->update( 'recentchanges', $this->userSpecification( $to, 'rc_user', 'rc_user_text' ),
+						$this->userConditions( $from, 'rc_user', 'rc_user_text' ), __METHOD__ );
 					$this->output( "done.\n" );
 				}
-			}	
+			}
 		}
-	
+
 		$dbw->commit();
-		return (int)$total;	
+		return (int)$total;
 	}
-	
+
 	/**
 	 * Return the most efficient set of user conditions
 	 * i.e. a user => id mapping, or a user_text => text mapping
@@ -129,7 +133,7 @@ class ReassignEdits extends Maintenance {
 	private function userConditions( &$user, $idfield, $utfield ) {
 		return $user->getId() ? array( $idfield => $user->getId() ) : array( $utfield => $user->getName() );
 	}
-	
+
 	/**
 	 * Return user specifications
 	 * i.e. user => id, user_text => text
@@ -142,7 +146,7 @@ class ReassignEdits extends Maintenance {
 	private function userSpecification( &$user, $idfield, $utfield ) {
 		return array( $idfield => $user->getId(), $utfield => $user->getName() );
 	}
-	
+
 	/**
 	 * Initialise the user object
 	 *
@@ -150,7 +154,7 @@ class ReassignEdits extends Maintenance {
 	 * @return User
 	 */
 	private function initialiseUser( $username ) {
-		if( User::isIP( $username ) ) {
+		if ( User::isIP( $username ) ) {
 			$user = new User();
 			$user->setId( 0 );
 			$user->setName( $username );
@@ -165,5 +169,5 @@ class ReassignEdits extends Maintenance {
 }
 
 $maintClass = "ReassignEdits";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
 
-- 
cgit v1.2.2