SECURITY: Escape internal error message

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

diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index f6e9e9c..f6c0673 100644 (file)
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -106,7 +106,8 @@ class RefreshImageMetadata extends Maintenance {
                $error = 0;
 
                $dbw = $this->getDB( DB_MASTER );
-               if ( $this->mBatchSize <= 0 ) {
+               $batchSize = $this->getBatchSize();
+               if ( $batchSize <= 0 ) {
                        $this->error( "Batch size is too low...", 12 );
                }
 
@@ -120,17 +121,20 @@ class RefreshImageMetadata extends Maintenance {
                }
 
                $options = [
-                       'LIMIT' => $this->mBatchSize,
+                       'LIMIT' => $batchSize,
                        'ORDER BY' => 'img_name ASC',
                ];
 
+               $fileQuery = LocalFile::getQueryInfo();
+
                do {
                        $res = $dbw->select(
-                               'image',
-                               '*',
+                               $fileQuery['tables'],
+                               $fileQuery['fields'],
                                array_merge( $conds, $conds2 ),
                                __METHOD__,
-                               $options
+                               $options,
+                               $fileQuery['joins']
                        );
 
                        if ( $res->numRows() > 0 ) {
@@ -191,7 +195,7 @@ class RefreshImageMetadata extends Maintenance {
                        }
                        $conds2 = [ 'img_name > ' . $dbw->addQuotes( $row->img_name ) ];
                        wfWaitForSlaves();
-               } while ( $res->numRows() === $this->mBatchSize );
+               } while ( $res->numRows() === $batchSize );
 
                $total = $upgraded + $leftAlone;
                if ( $force ) {