From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 11 May 2010 21:17:23 +0000 (+0000)
Subject: Followup to r66168
X-Git-Tag: 1.31.0-rc.0~36887
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=081ed1b9ef40c5e8dd823aa6962190333b4a5bc7;p=lhc%2Fweb%2Fwiklou.git

Followup to r66168

sha1 overrides sha1base36

Update ApiQueryAllimages similarily, seeing as it doesn't state it either
---

diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 8e6774ef4d..af91959eeb 100644
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -185,7 +185,7 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 			'minsize' => 'Limit to images with at least this many bytes',
 			'maxsize' => 'Limit to images with at most this many bytes',
 			'limit' => 'How many total images to return.',
-			'sha1' => 'SHA1 hash of image',
+			'sha1' => 'SHA1 hash of image. Overrides sha1base36',
 			'sha1base36' => 'SHA1 hash of image in base 36 (used in MediaWiki)',
 			'prop' => 'Which properties to get',
 		);
diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index f50c035552..d1ec13b381 100644
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -73,15 +73,13 @@ class ApiQueryFilearchive extends ApiQueryBase {
 		$this->addFieldsIf( 'fa_size', $fld_size );
 
 		if ( $fld_dimensions ) {
-			$this->addFields( 'fa_height' );
-			$this->addFields( 'fa_width' );
+			$this->addFields( array( 'fa_height', 'fa_width' ) );
 		}
 
 		$this->addFieldsIf( 'fa_description', $fld_description );
 
 		if ( $fld_mime ) {
-			$this->addFields( 'fa_major_mime' );
-			$this->addFields( 'fa_minor_mime' );
+			$this->addFields( array( 'fa_major_mime', 'fa_minor_mime' ) );
 		}
 
 		$this->addFieldsIf( 'fa_metadata', $fld_metadata );
@@ -219,7 +217,7 @@ class ApiQueryFilearchive extends ApiQueryBase {
 			'minsize' => 'Limit to images with at least this many bytes',
 			'maxsize' => 'Limit to images with at most this many bytes',
 			'limit' => 'How many total images to return.',
-			'sha1' => 'SHA1 hash of image',
+			'sha1' => 'SHA1 hash of image. Overrides sha1base36',
 			'sha1base36' => 'SHA1 hash of image in base 36 (used in MediaWiki)',
 			'prop' => 'Which properties to get',
 		);