X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiBase.php;h=0cd98064ae78e255aebe9b33842b081c4d139ec6;hb=4e9300e2beb07c40f0c7d5f63323c498a0331800;hp=8b6a3e582f643b4361b5154a3489b883c4c51868;hpb=41355718e137b2ed88160ad5ddb4db50336d54d9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 8b6a3e582f..0cd98064ae 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -274,7 +274,7 @@ abstract class ApiBase extends ContextSource {
 	/** @var array Maps extension paths to info arrays */
 	private static $extensionInfo = null;
 
-	/** @var int[][][] Cache for self::filterIDs() */
+	/** @var stdClass[][] Cache for self::filterIDs() */
 	private static $filterIDsCache = [];
 
 	/** $var array Map of web UI block messages to corresponding API messages and codes */
@@ -1308,8 +1308,15 @@ abstract class ApiBase extends ContextSource {
 						}
 						break;
 					case 'limit':
+						// Must be a number or 'max'
+						if ( $value !== 'max' ) {
+							$value = (int)$value;
+						}
+						if ( $multi ) {
+							self::dieDebug( __METHOD__, "Multi-values not supported for $encParamName" );
+						}
 						if ( !$parseLimit ) {
-							// Don't do any validation whatsoever
+							// Don't do min/max validation and don't parse 'max'
 							break;
 						}
 						if ( !isset( $paramSettings[self::PARAM_MAX] )
@@ -1320,21 +1327,16 @@ abstract class ApiBase extends ContextSource {
 								"MAX1 or MAX2 are not defined for the limit $encParamName"
 							);
 						}
-						if ( $multi ) {
-							self::dieDebug( __METHOD__, "Multi-values not supported for $encParamName" );
-						}
-						$min = $paramSettings[self::PARAM_MIN] ?? 0;
-						if ( $value == 'max' ) {
+						if ( $value === 'max' ) {
 							$value = $this->getMain()->canApiHighLimits()
 								? $paramSettings[self::PARAM_MAX2]
 								: $paramSettings[self::PARAM_MAX];
 							$this->getResult()->addParsedLimit( $this->getModuleName(), $value );
 						} else {
-							$value = (int)$value;
 							$this->validateLimit(
 								$paramName,
 								$value,
-								$min,
+								$paramSettings[self::PARAM_MIN] ?? 0,
 								$paramSettings[self::PARAM_MAX],
 								$paramSettings[self::PARAM_MAX2]
 							);