X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FreassignEdits.php;h=679cadb96fa03df1642da84535628a2d45b54876;hb=b35ebdb1f568c2dea5dd504d7748116a68849e11;hp=89237a5faefb9f6dc8f5d0c719b68ec4cdf09819;hpb=fd3ac84a6b10145fe79a8479bd0e9afc84e3a763;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index 89237a5fae..679cadb96f 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -79,13 +79,23 @@ class ReassignEdits extends Maintenance { # 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" ); @@ -125,6 +140,7 @@ class ReassignEdits extends Maintenance { } $dbw->commit( __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; } }