From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 29 Jun 2007 20:22:33 +0000 (+0000)
Subject: Making non-fm formats return help text when action=help is explicitly
X-Git-Tag: 1.31.0-rc.0~52319
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=a0783fbd7403b7d39f02cfe8c8ede8e25306b71f;p=lhc%2Fweb%2Fwiklou.git

Making non-fm formats return help text when action=help is explicitly
set (bug 10391).
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58cd045a86..bc0ab95174 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -285,6 +285,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10260) Show page protection status
 * (bug 10392) Include MediaWiki version details in version output
 * (bug 10411) Site language in meta=siteinfo
+* (bug 10391) action=help doesn't return help if format is fancy markup
 
 == Maintenance script changes since 1.10 ==
 
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index fda6f884e0..dc2a697fa9 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -197,7 +197,7 @@ class ApiMain extends ApiBase {
 				'code' => $e->getCodeString(), 'info' => $e->getMessage());
 				
 				// Only print the help message when this is for the developer, not runtime
-				if ($this->mPrinter->getIsHtml())
+				if ($this->mPrinter->getIsHtml() || $this->getRequest()->getVal('action') == 'help')
 					ApiResult :: setContent($errMessage, $this->makeHelpMsg());
 
 			} else {