API: Fixing limit=max output; previous implementation threw fatal errors under certai...

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 001cdd4..5551b01 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -452,7 +452,7 @@ abstract class ApiBase {
                                                if( $value == 'max' ) {
                                                        if( $parseMaxLimit ) {
                                                                $value = $this->getMain()->canApiHighLimits() ? $paramSettings[self :: PARAM_MAX2] : $paramSettings[self :: PARAM_MAX];
-                                                               $this->getResult()->addValue( 'limits', 'limit', $value );
+                                                               $this->getResult()->addValue( 'limits', $this->getModuleName(), $value );
                                                                $this->validateLimit($paramName, $value, $min, $paramSettings[self :: PARAM_MAX], $paramSettings[self :: PARAM_MAX2]);
                                                        }
                                                }

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 3dff0bc..c93aefc 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -124,7 +124,7 @@ class ApiQueryRevisions extends ApiQueryBase {
                $botMax  = ( $this->fld_content ? ApiBase::LIMIT_SML2 : ApiBase::LIMIT_BIG2 );
                if( $limit == 'max' ) {
                        $limit = $this->getMain()->canApiHighLimits() ? $botMax : $userMax;
-                       $this->getResult()->addValue( 'limits', 'limit', $limit );
+                       $this->getResult()->addValue( 'limits', $this->getModuleName(), $limit );
                }
 
                if ($enumRevMode) {