API: (bug 18749) Add generator flag to action=paraminfo output. Also fixes an interna...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 24c5bfd..303eedd 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -138,6 +138,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18731) Show correct SVN links for extension modules in api.php?version
 * (bug 18730) Add version information to action=paraminfo output
 * (bug 18743) Add ucprop=size to list=usercontribs
+* (bug 18749) Add generator flag to action=paraminfo output
 
 === Languages updated in 1.16 ===
 

diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 41925d1..403264b 100644 (file)
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -94,7 +94,7 @@ class ApiParamInfo extends ApiBase {
                $result = $this->getResult();
                $retval['classname'] = get_class($obj);
                $retval['description'] = implode("\n", (array)$obj->getDescription());
-               $retval['version'] = $obj->getVersion();
+               $retval['version'] = implode("\n", (array)$obj->getVersion());
                $retval['prefix'] = $obj->getModulePrefix();
                if($obj->isReadMode())
                        $retval['readrights'] = '';
@@ -102,6 +102,8 @@ class ApiParamInfo extends ApiBase {
                        $retval['writerights'] = '';
                if($obj->mustBePosted())
                        $retval['mustbeposted'] = '';
+               if($obj instanceof ApiQueryGeneratorBase)
+                       $retval['generator'] = '';
                $allowedParams = $obj->getFinalParams();
                if(!is_array($allowedParams))
                        return $retval;