From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 24 Apr 2014 22:46:08 +0000 (-0700)
Subject: Avoid query error with odd parameter combination
X-Git-Tag: 1.31.0-rc.0~16015
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=4452e759d43572ba97f58b33ba7883e5ac8837c1;p=lhc%2Fweb%2Fwiklou.git

Avoid query error with odd parameter combination

Change-Id: I1fc4495d665ff2c1e0cbf274ee2081a06c4e603b
---

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 {