X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateFilearchiveSha1.php;h=c579d4fcd949cbc3d9bd8ede8d027fc5f8fa3d1a;hb=dd7d5db7ab001c7a4ed722e2f5295e335bab79ec;hp=6c57fde6222cbb038d548465f1eef0b63257a924;hpb=f83f36ef612fb444eec2e84251dbe20d619e3958;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateFilearchiveSha1.php b/maintenance/populateFilearchiveSha1.php
index 6c57fde622..c579d4fcd9 100644
--- a/maintenance/populateFilearchiveSha1.php
+++ b/maintenance/populateFilearchiveSha1.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once dirname( __FILE__ ) . '/Maintenance.php';
 
 /**
  * Maintenance script to populate the fa_sha1 field.
@@ -48,6 +48,12 @@ class PopulateFilearchiveSha1 extends LoggedUpdateMaintenance {
 		$dbw = wfGetDB( DB_MASTER );
 		$table = 'filearchive';
 		$conds = array( 'fa_sha1' => '', 'fa_storage_key IS NOT NULL' );
+
+		if ( !$dbw->fieldExists( $table, 'fa_sha1', __METHOD__ ) ) {
+			$this->output( "fa_sha1 column does not exist\n\n", true );
+			return false;
+		}
+
 		$this->output( "Populating fa_sha1 field from fa_storage_key\n" );
 		$endId = $dbw->selectField( $table, 'MAX(fa_id)', false, __METHOD__ );
 
@@ -80,7 +86,7 @@ class PopulateFilearchiveSha1 extends LoggedUpdateMaintenance {
 			}
 
 			$done += $i;
-			if( $i !== $batchSize ) {
+			if ( $i !== $batchSize ) {
 				break;
 			}
 
@@ -88,7 +94,7 @@ class PopulateFilearchiveSha1 extends LoggedUpdateMaintenance {
 			$this->output( sprintf(
 				"id %d done (up to %d), %5.3f%%  \r", $lastId, $endId, $lastId / $endId * 100 ) );
 			wfWaitForSlaves();
-		} while( true );
+		} while ( true );
 
 		$processingTime = microtime( true ) - $startTime;
 		$this->output( sprintf( "\nDone %d files in %.1f seconds\n", $done, $processingTime ) );
@@ -98,4 +104,4 @@ class PopulateFilearchiveSha1 extends LoggedUpdateMaintenance {
 }
 
 $maintClass = "PopulateFilearchiveSha1";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;