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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9f33006..07d1669 100644 (file)
--- 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 26f0398..5849286 100644 (file)
--- 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] ) {