http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65319

Revision: 65319
Author:   demon
Date:     2010-04-20 14:19:12 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Merge r64454 from trunk

Modified Paths:
--------------
    branches/REL1_16/phase3/includes/api/ApiBase.php

Modified: branches/REL1_16/phase3/includes/api/ApiBase.php
===================================================================
--- branches/REL1_16/phase3/includes/api/ApiBase.php    2010-04-20 14:19:05 UTC 
(rev 65318)
+++ branches/REL1_16/phase3/includes/api/ApiBase.php    2010-04-20 14:19:12 UTC 
(rev 65319)
@@ -475,8 +475,10 @@
                $params = $this->getFinalParams();
                $results = array();
 
-               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 );
+                       }
                }
 
                return $results;



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to