From 4452e759d43572ba97f58b33ba7883e5ac8837c1 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 24 Apr 2014 15:46:08 -0700 Subject: [PATCH] Avoid query error with odd parameter combination Change-Id: I1fc4495d665ff2c1e0cbf274ee2081a06c4e603b --- maintenance/populateImageSha1.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php index d7c26d5ce4..e9123aa344 100644 --- a/maintenance/populateImageSha1.php +++ b/maintenance/populateImageSha1.php @@ -82,7 +82,10 @@ class PopulateImageSha1 extends LoggedUpdateMaintenance { } $this->output( "Populating img_sha1 field for specified files\n" ); } else { - if ( $force ) { + if ( $this->hasOption( 'multiversiononly' ) ) { + $conds = array(); + $this->output( "Populating and recalculating img_sha1 field for versioned files\n" ); + } elseif ( $force ) { $conds = array(); $this->output( "Populating and recalculating img_sha1 field\n" ); } else { -- 2.20.1