Making non-fm formats return help text when action=help is explicitly

set (bug 10391).

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58cd045..bc0ab95 100644 (file)
--- 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 fda6f88..dc2a697 100644 (file)
--- 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 {