API: Adding parameter description to action=paraminfo output

diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index cc52702..eb89ec5 100644 (file)
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -78,6 +78,7 @@ class ApiParamInfo extends ApiBase {
                if(!is_array($allowedParams))\r
                        return $retval;\r
                $retval['parameters'] = array();\r
+               $paramDesc = $obj->getParamDescription();\r
                foreach($obj->getAllowedParams() as $n => $p)\r
                {\r
                        $a = array('name' => $n);\r
@@ -111,6 +112,8 @@ class ApiParamInfo extends ApiBase {
                                $a['highmax'] = $p[ApiBase::PARAM_MAX2];\r
                        if(isset($p[ApiBase::PARAM_MIN]))\r
                                $a['min'] = $p[ApiBase::PARAM_MIN];\r
+                       if(isset($paramDesc[$n]))\r
+                               $a['description'] = (is_array($paramDesc[$n]) ? implode("\n", $paramDesc[$n]) : $paramDesc[$n]);\r
                        $retval['parameters'][] = $a;\r
                }\r
                $result->setIndexedTagName($retval['parameters'], 'param');\r