X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrebuildImages.php;h=5a1496786f9e3f17dd501f2535e092ac34d2dcfd;hb=8c34c8ed5e3f581b0d507aa7a4a90ac776aa9a87;hp=8b0b05748c2e83873e8b67afe35b9042247e4312;hpb=eb82ee35ae8a49b2b6a898ce1a06c639253cd898;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php index 8b0b05748c..5a1496786f 100644 --- a/maintenance/rebuildImages.php +++ b/maintenance/rebuildImages.php @@ -79,6 +79,7 @@ class ImageBuilder extends Maintenance { if ( !isset( $this->repo ) ) { $this->repo = RepoGroup::singleton()->getLocalRepo(); } + return $this->repo; } @@ -149,6 +150,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 +163,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 +205,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; } }