From 287c9ea4f5023a3410730929668d29bf3d47212f Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 26 Jul 2010 06:20:29 +0000
Subject: [PATCH] Partial revert of r69782: reverted the cache feature, it does
 not correctly respect $parseLimit.

---
 includes/api/ApiBase.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 397f9e4718..d4f7d95661 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -479,18 +479,16 @@ abstract class ApiBase {
 	 * @return array
 	 */
 	public function extractRequestParams( $parseLimit = true ) {
-		if ( !isset( $this->mCachedRequestParams ) ) {
-			$params = $this->getFinalParams();
-			$this->mCachedRequestParams = array();
+		$params = $this->getFinalParams();
+		$results = array();
 
-			if ( $params ) { // getFinalParams() can return false
-				foreach ( $params as $paramName => $paramSettings ) {
-					$this->mCachedRequestParams[$paramName] = $this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
-				}
+		if ( $params ) { // getFinalParams() can return false
+			foreach ( $params as $paramName => $paramSettings ) {
+				$results[$paramName] = $this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
 			}
 		}
 
-		return $this->mCachedRequestParams;
+		return $results;
 	}
 
 	/**
-- 
2.20.1