Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reintroduced the extractRequestParams() memoization as in r69782, but respecting $parseLimit. Fixes bug 24564 (fatal error due to duplicate calls to addValue()).

Browse source
This commit is contained in:
Tim Starling 2010-07-28 04:12:36 +00:00
parent a908532263
commit 6afbc6762c
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/api/ApiBase.php
View file

@ -57,6 +57,7 @@ abstract class ApiBase {
const LIMIT_SML2 = 500; // Slow query, bot/sysop limit
private $mMainModule, $mModuleName, $mModulePrefix;
private $mParamCache = array();
/**
* Constructor
@ -479,16 +480,20 @@ abstract class ApiBase {
* @return array
*/
public function extractRequestParams( $parseLimit = true ) {
$params = $this->getFinalParams();
$results = array();
// Cache parameters, for performance and to avoid bug 24564.
if ( !isset( $this->mParamCache[$parseLimit] ) ) {
$params = $this->getFinalParams();
$results = array();
if ( $params ) { // getFinalParams() can return false
foreach ( $params as $paramName => $paramSettings ) {
$results[$paramName] = $this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
if ( $params ) { // getFinalParams() can return false
foreach ( $params as $paramName => $paramSettings ) {
$results[$paramName] = $this->getParameterFromSettings(
$paramName, $paramSettings, $parseLimit );
}
}
$this->mParamCache[$parseLimit] = $results;
}
return $results;
return $this->mParamCache[$parseLimit];
}
/**