Merge "jquery.badge: Align with Echo notifications style and WikimediaUI palette"

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

diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index b557f3d..41da6b4 100644 (file)
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -127,7 +127,7 @@ class RefreshImageMetadata extends Maintenance {
                do {
                        $res = $dbw->select(
                                'image',
-                               '*',
+                               LocalFile::selectFields(),
                                array_merge( $conds, $conds2 ),
                                __METHOD__,
                                $options
@@ -135,10 +135,8 @@ class RefreshImageMetadata extends Maintenance {
 
                        if ( $res->numRows() > 0 ) {
                                $row1 = $res->current();
-                               $this->output( "Processing next {$this->mBatchSize} rows starting with {$row1->img_name}.\n" );
+                               $this->output( "Processing next {$res->numRows()} row(s) starting with {$row1->img_name}.\n" );
                                $res->rewind();
-                       } else {
-                               $this->error( "No images to process.", 4 );
                        }
 
                        foreach ( $res as $row ) {