From d76bdf62bef1ad78d27b27de36e28c9fb5a1a74b Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sun, 10 May 2009 09:52:31 +0000
Subject: [PATCH] API: (bug 18749) Add generator flag to action=paraminfo
 output. Also fixes an internal error in r50367

---
 RELEASE-NOTES                 | 1 +
 includes/api/ApiParamInfo.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 24c5bfd337..303eeddd8e 100644
--- 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 41925d1d4f..403264b736 100644
--- 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;
-- 
2.20.1