From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 29 Apr 2011 20:52:57 +0000 (+0000)
Subject: * (bug 28238) paraminfo: output both limits for multi param
X-Git-Tag: 1.31.0-rc.0~30510
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/?a=commitdiff_plain;h=32f84430644e176a7a55ebd9cb909203f41ec952;p=lhc%2Fweb%2Fwiklou.git

* (bug 28238) paraminfo: output both limits for multi param
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9f330063f6..07d166948f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -362,6 +362,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 26882) Allow listing of indefinite protections with the API.
 * (bug 27344) add drprefix param to list=deletedrevs.
 * (bug 28560) list=deletedrevs should die, if combination of param is invalid.
+* (bug 28238) paraminfo: output both limits for multi param
 
 === Languages updated in 1.18 ===
 
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 26f0398f0f..5849286f39 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -162,9 +162,8 @@ class ApiParamInfo extends ApiBase {
 			}
 			if ( isset( $p[ApiBase::PARAM_ISMULTI] ) && $p[ApiBase::PARAM_ISMULTI] ) {
 				$a['multi'] = '';
-				$a['limit'] = $this->getMain()->canApiHighLimits() ?
-						ApiBase::LIMIT_SML2 :
-						ApiBase::LIMIT_SML1;
+				$a['limit'] = ApiBase::LIMIT_SML1;
+				$a['highlimit'] = ApiBase::LIMIT_SML2;
 			}
 
 			if ( isset( $p[ApiBase::PARAM_ALLOW_DUPLICATES] ) && $p[ApiBase::PARAM_ALLOW_DUPLICATES] ) {