Avoid query error with odd parameter combination

Change-Id: I1fc4495d665ff2c1e0cbf274ee2081a06c4e603b

diff --git a/maintenance/populateImageSha1.php b/maintenance/populateImageSha1.php
index d7c26d5..e9123aa 100644 (file)
--- 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 {