Merge "auth: Follow up on e907d4328dc3e"

[lhc/web/wiklou.git] / maintenance / migrateComments.php

diff --git a/maintenance/migrateComments.php b/maintenance/migrateComments.php
index c35315d..555f2d1 100644 (file)
--- 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(