X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=inline;f=maintenance%2FpopulateLogUsertext.php;h=d3b1dd5ceccb4b11d976d9fbd3c5faa7fc001c7f;hb=f980fa58a14b66ccd875d481c632ee3213b375b9;hp=359ee95bae3dacadade92bae61e67f951e6b0a42;hpb=a1c51e18af85a9ac464c5b555921e58ec422cd11;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index 359ee95bae..d3b1dd5cec 100644
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -23,7 +23,7 @@
  * @ingroup Maintenance
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class PopulateLogUsertext extends Maintenance {
 	public function __construct() {
@@ -35,7 +35,7 @@ class PopulateLogUsertext extends Maintenance {
 	public function execute() {
 		$db = wfGetDB( DB_MASTER );
 		$start = $db->selectField( 'logging', 'MIN(log_id)', false, __METHOD__ );
-		if( !$start ) {
+		if ( !$start ) {
 			$this->output( "Nothing to do.\n" );
 			return true;
 		}
@@ -45,23 +45,23 @@ class PopulateLogUsertext extends Maintenance {
 		$end += $this->mBatchSize - 1;
 		$blockStart = $start;
 		$blockEnd = $start + $this->mBatchSize - 1;
-		while( $blockEnd <= $end ) {
+		while ( $blockEnd <= $end ) {
 			$this->output( "...doing log_id from $blockStart to $blockEnd\n" );
 			$cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id";
-			$res = $db->select( array('logging','user'), 
-				array('log_id','user_name'), $cond, __METHOD__ );
-			$batch = array();
+			$res = $db->select( array( 'logging', 'user' ),
+				array( 'log_id', 'user_name' ), $cond, __METHOD__ );
+
 			$db->begin();
-			while( $row = $db->fetchObject( $res ) ) {
-				$db->update( 'logging', array('log_user_text' => $row->user_name),
-					array('log_id' => $row->log_id), __METHOD__ );
+			foreach ( $res as $row ) {
+				$db->update( 'logging', array( 'log_user_text' => $row->user_name ),
+					array( 'log_id' => $row->log_id ), __METHOD__ );
 			}
 			$db->commit();
 			$blockStart += $this->mBatchSize;
 			$blockEnd += $this->mBatchSize;
 			wfWaitForSlaves( 5 );
 		}
-		if( $db->insert(
+		if ( $db->insert(
 				'updatelog',
 				array( 'ul_key' => 'populate log_usertext' ),
 				__METHOD__,