r65313 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r65312‎ | r65313 | r65314 >
Date:13:58, 20 April 2010
Author:catrope
Status:ok
Tags:
Comment:
1.16wmf4: Revert r64778, merge the almost equivalent but better r64454 from trunk
Modified paths:
  • /branches/wmf/1.16wmf4/includes/api (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiBase.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/includes/api/ApiBase.php
@@ -475,8 +475,10 @@
476476 $params = $this->getFinalParams();
477477 $results = array();
478478
479 - foreach ( (array)$params as $paramName => $paramSettings ) {
480 - $results[$paramName] = $this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
 479+ if($params) { /* getFinalParams() can return false */
 480+ foreach ( $params as $paramName => $paramSettings ) {
 481+ $results[$paramName] = $this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
 482+ }
481483 }
482484
483485 return $results;
Property changes on: branches/wmf/1.16wmf4/includes/api
___________________________________________________________________
Name: svn:mergeinfo
484486 - /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970
/trunk/phase3/includes/api:63549,63764,63897-63901
485487 + /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952,60970
/trunk/phase3/includes/api:63549,63764,63897-63901,64454

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r64454Get rid of E_STRICT messagemah19:50, 31 March 2010
r647781.16wmf4: Fix PHP warningcatrope09:33, 9 April 2010

Status & tagging log