* API: help screen now shows default and allowed parameter values

[lhc/web/wiklou.git] / includes / api / ApiResult.php

diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index 8421afa..7f0a1fb 100644 (file)
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -73,11 +73,19 @@ class ApiResult extends ApiBase {
        /**
         * Adds the content element to the array.
         * Use this function instead of hardcoding the '*' element.
+        * @param string $subElemName when present, content element is created as a sub item of the arr.
+        *  Use this parameter to create elements in format <elem>text</elem> without attributes
         */
-       public static function setContent(& $arr, $value) {
+       public static function setContent(& $arr, $value, $subElemName = null) {
                if (is_array($value))
                        ApiBase :: dieDebug(__METHOD__, 'Bad parameter');
-               ApiResult :: setElement($arr, '*', $value);
+               if (is_null($subElemName)) {
+                       ApiResult :: setElement($arr, '*', $value);
+               } else {
+                       if (!isset ($arr[$subElemName]))
+                               $arr[$subElemName] = array ();
+                       ApiResult :: setElement($arr[$subElemName], '*', $value);
+               }
        }
 
        //      public static function makeContentElement($tag, $value) {