Don't check namespace in SpecialWantedtemplates

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

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 8b0b057..8e39978 100644 (file)
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -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,21 +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
-                               )
-                       ) {
+                               '',
+                               '(recovered file, missing upload log entry)',
+                               '',
+                               '',
+                               '',
+                               false,
+                               $timestamp
+                       ) ) {
                                $this->output( "Error uploading file $fullpath\n" );
+
                                return;
                        }
                }