X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=maintenance%2FrefreshImageMetadata.php;h=b7f03d9bb66128ce1211d6dd8ea8ba6993f2dfa9;hb=b2c724fca2083f59f522ffa441654c13b383a108;hp=b557f3d3df4242bf02b90e1910072dca09464337;hpb=2dd58ade75d15a5895c0c010e17b6f729a0f72fe;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php index b557f3d3df..b7f03d9bb6 100644 --- a/maintenance/refreshImageMetadata.php +++ b/maintenance/refreshImageMetadata.php @@ -124,21 +124,22 @@ class RefreshImageMetadata extends Maintenance { '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 ) { $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 ) {