From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 18 Mar 2011 20:50:40 +0000 (+0000)
Subject: Improve query building if's to cater for addition of columns
X-Git-Tag: 1.31.0-rc.0~31343
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=478bcebf1229d2d1e9b479019dee2a89d06b965c;p=lhc%2Fweb%2Fwiklou.git

Improve query building if's to cater for addition of columns
---

diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index 36adbc12cf..b791f176f5 100644
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -73,10 +73,9 @@ class ApiQueryFilearchive extends ApiQueryBase {
 		if ( $fld_user ) {
 			$this->addFields( array( 'fa_user', 'fa_user_text' ) );
 		}
-		$this->addFieldsIf( 'fa_size', $fld_size );
 
-		if ( $fld_dimensions ) {
-			$this->addFields( array( 'fa_height', 'fa_width' ) );
+		if ( $fld_dimensions || $fld_size ) {
+			$this->addFields( array( 'fa_height', 'fa_width', 'fa_size' ) );
 		}
 
 		$this->addFieldsIf( 'fa_description', $fld_description );