X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FmigrateComments.php;h=555f2d13f03b9307d94f7a0783a0ebed85b80e86;hb=0601f359eb5fb2bf9ea28a4277d8f20c3e66a248;hp=c35315d71b8d10e7236495d3fde6067587d9cb64;hpb=11ee7f78da9776db26098642a151a288f98bea14;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/migrateComments.php b/maintenance/migrateComments.php
index c35315d71b..555f2d13f0 100644
--- a/maintenance/migrateComments.php
+++ b/maintenance/migrateComments.php
@@ -61,9 +61,7 @@ class MigrateComments extends LoggedUpdateMaintenance {
 		);
 		$this->migrate( 'archive', 'ar_id', 'ar_comment' );
 		$this->migrate( 'ipblocks', 'ipb_id', 'ipb_reason' );
-		$this->migrateToTemp(
-			'image', 'img_name', 'img_description', 'imgcomment_name', 'imgcomment_description_id'
-		);
+		$this->migrate( 'image', 'img_name', 'img_description' );
 		$this->migrate( 'oldimage', [ 'oi_name', 'oi_timestamp' ], 'oi_description' );
 		$this->migrate( 'filearchive', 'fa_id', 'fa_deleted_reason' );
 		$this->migrate( 'filearchive', 'fa_id', 'fa_description' );
@@ -205,7 +203,7 @@ class MigrateComments extends LoggedUpdateMaintenance {
 					$next = "$field > $value OR $field = $value AND ($next)";
 				}
 			}
-			$prompt = join( ' ', array_reverse( $prompt ) );
+			$prompt = implode( ' ', array_reverse( $prompt ) );
 			$this->output( "... $prompt\n" );
 			wfWaitForSlaves();
 		}
@@ -282,7 +280,6 @@ class MigrateComments extends LoggedUpdateMaintenance {
 			// Calculate the "next" condition
 			$next = [ $primaryKey . ' > ' . $dbw->addQuotes( $row->$primaryKey ) ];
 			$this->output( "... {$row->$primaryKey}\n" );
-			wfWaitForSlaves();
 		}
 
 		$this->output(