X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrefreshImageMetadata.php;h=65db94da1a727346d157a468ee857f650fe995f7;hb=801a8bdaa38cea5ff4db0440c82e9eb83e083772;hp=41da6b46e405517a5b887fe2b97fdbcd5ba7f2de;hpb=732b5e2745ca8f6153e19cc10c3c9acb1b2a6331;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index 41da6b46e4..65db94da1a 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -106,8 +106,9 @@ class RefreshImageMetadata extends Maintenance {
 		$error = 0;
 
 		$dbw = $this->getDB( DB_MASTER );
-		if ( $this->mBatchSize <= 0 ) {
-			$this->error( "Batch size is too low...", 12 );
+		$batchSize = $this->getBatchSize();
+		if ( $batchSize <= 0 ) {
+			$this->fatalError( "Batch size is too low...", 12 );
 		}
 
 		$repo = RepoGroup::singleton()->getLocalRepo();
@@ -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',
-				LocalFile::selectFields(),
+				$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 ) {
@@ -251,10 +255,10 @@ class RefreshImageMetadata extends Maintenance {
 		}
 
 		if ( $brokenOnly && $force ) {
-			$this->error( 'Cannot use --broken-only and --force together. ', 2 );
+			$this->fatalError( 'Cannot use --broken-only and --force together. ', 2 );
 		}
 	}
 }
 
-$maintClass = 'RefreshImageMetadata';
+$maintClass = RefreshImageMetadata::class;
 require_once RUN_MAINTENANCE_IF_MAIN;