X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FreassignEdits.php;h=4d3baaf2c8ae7bce70234ff4301bbcefc89c5117;hb=4dc3ac1c375b3d2eb6172dfef8fdebe71b8c5f43;hp=89237a5faefb9f6dc8f5d0c719b68ec4cdf09819;hpb=0c04628d6c10e630133a93028761b8332584eb9d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 89237a5fae..4d3baaf2c8 100644
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -34,7 +34,7 @@ require_once __DIR__ . '/Maintenance.php';
 class ReassignEdits extends Maintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Reassign edits from one user to another";
+		$this->addDescription( 'Reassign edits from one user to another' );
 		$this->addOption( "force", "Reassign even if the target user doesn't exist" );
 		$this->addOption( "norc", "Don't update the recent changes table" );
 		$this->addOption( "report", "Print out details of what would be changed, but don't update it" );
@@ -74,18 +74,28 @@ class ReassignEdits extends Maintenance {
 	 * @return int Number of entries changed, or that would be changed
 	 */
 	private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) {
-		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin( __METHOD__ );
+		$dbw = $this->getDB( DB_MASTER );
+		$this->beginTransaction( $dbw, __METHOD__ );
 
 		# Count things
 		$this->output( "Checking current edits..." );
-		$res = $dbw->select( 'revision', 'COUNT(*) AS count', $this->userConditions( $from, 'rev_user', 'rev_user_text' ), __METHOD__ );
+		$res = $dbw->select(
+			'revision',
+			'COUNT(*) AS count',
+			$this->userConditions( $from, 'rev_user', 'rev_user_text' ),
+			__METHOD__
+		);
 		$row = $dbw->fetchObject( $res );
 		$cur = $row->count;
 		$this->output( "found {$cur}.\n" );
 
 		$this->output( "Checking deleted edits..." );
-		$res = $dbw->select( 'archive', 'COUNT(*) AS count', $this->userConditions( $from, 'ar_user', 'ar_user_text' ), __METHOD__ );
+		$res = $dbw->select(
+			'archive',
+			'COUNT(*) AS count',
+			$this->userConditions( $from, 'ar_user', 'ar_user_text' ),
+			__METHOD__
+		);
 		$row = $dbw->fetchObject( $res );
 		$del = $row->count;
 		$this->output( "found {$del}.\n" );
@@ -93,7 +103,12 @@ class ReassignEdits extends Maintenance {
 		# Don't count recent changes if we're not supposed to
 		if ( $rc ) {
 			$this->output( "Checking recent changes..." );
-			$res = $dbw->select( 'recentchanges', 'COUNT(*) AS count', $this->userConditions( $from, 'rc_user', 'rc_user_text' ), __METHOD__ );
+			$res = $dbw->select(
+				'recentchanges',
+				'COUNT(*) AS count',
+				$this->userConditions( $from, 'rc_user', 'rc_user_text' ),
+				__METHOD__
+			);
 			$row = $dbw->fetchObject( $res );
 			$rec = $row->count;
 			$this->output( "found {$rec}.\n" );
@@ -124,7 +139,8 @@ class ReassignEdits extends Maintenance {
 			}
 		}
 
-		$dbw->commit( __METHOD__ );
+		$this->commitTransaction( $dbw, __METHOD__ );
+
 		return (int)$total;
 	}
 
@@ -138,7 +154,9 @@ class ReassignEdits extends Maintenance {
 	 * @return array
 	 */
 	private function userConditions( &$user, $idfield, $utfield ) {
-		return $user->getId() ? array( $idfield => $user->getId() ) : array( $utfield => $user->getName() );
+		return $user->getId()
+			? array( $idfield => $user->getId() )
+			: array( $utfield => $user->getName() );
 	}
 
 	/**
@@ -172,6 +190,7 @@ class ReassignEdits extends Maintenance {
 			}
 		}
 		$user->load();
+
 		return $user;
 	}
 }