* (bug 24287) Wrap/similar on api help output

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f641562..7500f7c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -45,6 +45,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 26339) Throw warning when truncating an overlarge API result
 * (bug 14869) Add API module for accessing QueryPage-based special pages
 * (bug 14020) API for Special:Unwatchedpages
+* (bug 24287) Wrap/similar on api help output
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 4637c93..ce45d6c 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -336,7 +336,9 @@ abstract class ApiBase {
                                                                $choices[] =  $t;
                                                        }
                                                }
-                                               $desc .= $paramPrefix . $nothingPrompt . $prompt . implode( ', ', $choices );
+                                                $desc .= $paramPrefix . $nothingPrompt . $prompt;
+                                                $choicesstring = implode( ', ', $choices );
+                                                $desc .= wordwrap( $choicesstring, 100, "\n                       " );
                                        } else {
                                                switch ( $type ) {
                                                        case 'namespace':