X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FrebuildImages.php;h=8e3997878ae63c0acf7f30d16f186cc478248c6d;hb=f4baf67270f1b593d7a4153eabd14c6c1011b310;hp=53bf823f0fdc4cbf4f65c56418ce6f78a079bf9c;hpb=6f3a0951d4f343d98d9b349d021dc550fd399cc4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 53bf823f0f..8e3997878a 100644
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -8,7 +8,7 @@
  *              add them only.
  *
  * Copyright © 2005 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * https://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +59,6 @@ class ImageBuilder extends Maintenance {
 
 	public function execute() {
 		$this->dbw = wfGetDB( DB_MASTER );
-		$this->maxLag = 10; # if slaves are lagged more than 10 secs, wait
 		$this->dryrun = $this->hasOption( 'dry-run' );
 		if ( $this->dryrun ) {
 			$GLOBALS['wgReadOnly'] = 'Dry run mode, image upgrades are suppressed';
@@ -79,6 +78,7 @@ class ImageBuilder extends Maintenance {
 		if ( !isset( $this->repo ) ) {
 			$this->repo = RepoGroup::singleton()->getLocalRepo();
 		}
+
 		return $this->repo;
 	}
 
@@ -149,6 +149,7 @@ class ImageBuilder extends Maintenance {
 		// Create a File object from the row
 		// This will also upgrade it
 		$file = $this->getRepo()->newFileFromRow( $row );
+
 		return $file->getUpgraded();
 	}
 
@@ -161,9 +162,11 @@ class ImageBuilder extends Maintenance {
 		// This will also upgrade it
 		if ( $row->oi_archive_name == '' ) {
 			$this->output( "Empty oi_archive_name for oi_name={$row->oi_name}\n" );
+
 			return false;
 		}
 		$file = $this->getRepo()->newFileFromRow( $row );
+
 		return $file->getUpgraded();
 	}
 
@@ -201,14 +204,22 @@ class ImageBuilder extends Maintenance {
 
 		if ( $filename == '' ) {
 			$this->output( "Empty filename for $fullpath\n" );
+
 			return;
 		}
 		if ( !$this->dryrun ) {
 			$file = wfLocalFile( $filename );
-			if ( !$file->recordUpload( '', '(recovered file, missing upload log entry)', '', '', '',
-				false, $timestamp ) )
-			{
+			if ( !$file->recordUpload(
+				'',
+				'(recovered file, missing upload log entry)',
+				'',
+				'',
+				'',
+				false,
+				$timestamp
+			) ) {
 				$this->output( "Error uploading file $fullpath\n" );
+
 				return;
 			}
 		}