From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 18 Jun 2010 09:30:38 +0000 (+0000)
Subject: (bug 24016) API: Handle parameters specified in simple string syntax ( 'paramname... 
X-Git-Tag: 1.31.0-rc.0~36478
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=fe66ef26cd3eb6415f3d8c8d93342d403c40ff82;p=lhc%2Fweb%2Fwiklou.git

(bug 24016) API: Handle parameters specified in simple string syntax ( 'paramname' => 'defaultval' ) correctly when outputting help. Patch by Brad Jorsch.
---

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index a89f41fad3..f9ac106f5f 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -294,6 +294,12 @@ abstract class ApiBase {
 					$desc = implode( $paramPrefix, $desc );
 				}
 
+				if ( !is_array( $paramSettings ) ) {
+					$paramSettings = array(
+						self::PARAM_DFLT => $paramSettings,
+					);
+				}
+
 				$deprecated = isset( $paramSettings[self::PARAM_DEPRECATED] ) ?
 					$paramSettings[self::PARAM_DEPRECATED] : false;
 				if ( $deprecated ) {