X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiHelp.php;h=a81ae3f81f9425efe2d433dfa25823b13a88759c;hb=df80f1ead5daa993facf934fb32b0d5e10e3d5b9;hp=27fc378c986f7970201d9357b8b34ff54028bb7a;hpb=fe5c31a59b1bdd01e6a84f373a4ca269ec9cb9bc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 27fc378c98..a81ae3f81f 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -490,14 +490,23 @@ class ApiHelp extends ApiBase {
 							switch ( $type ) {
 								case 'submodule':
 									$groups[] = $name;
-									$submodules = $module->getModuleManager()->getNames( $name );
+									if ( isset( $settings[ApiBase::PARAM_SUBMODULE_MAP] ) ) {
+										$map = $settings[ApiBase::PARAM_SUBMODULE_MAP];
+										ksort( $map );
+										$submodules = array();
+										foreach ( $map as $v => $m ) {
+											$submodules[] = "[[Special:ApiHelp/{$m}|{$v}]]";
+										}
+									} else {
+										$submodules = $module->getModuleManager()->getNames( $name );
+										sort( $submodules );
+										$prefix = $module->isMain()
+											? '' : ( $module->getModulePath() . '+' );
+										$submodules = array_map( function ( $name ) use ( $prefix ) {
+											return "[[Special:ApiHelp/{$prefix}{$name}|{$name}]]";
+										}, $submodules );
+									}
 									$count = count( $submodules );
-									sort( $submodules );
-									$prefix = $module->isMain()
-										? '' : ( $module->getModulePath() . '+' );
-									$submodules = array_map( function ( $name ) use ( $prefix ) {
-										return "[[Special:ApiHelp/{$prefix}{$name}|{$name}]]";
-									}, $submodules );
 									$info[] = $context->msg( 'api-help-param-list' )
 										->params( $multi ? 2 : 1 )
 										->params( $context->getLanguage()->commaList( $submodules ) )
@@ -564,6 +573,7 @@ class ApiHelp extends ApiBase {
 									break;
 
 								case 'string':
+								case 'text':
 									// Displaying a type message here would be useless.
 									$type = null;
 									break;
@@ -573,6 +583,7 @@ class ApiHelp extends ApiBase {
 						// Add type. Messages for grep: api-help-param-type-limit
 						// api-help-param-type-integer api-help-param-type-boolean
 						// api-help-param-type-timestamp api-help-param-type-user
+						// api-help-param-type-password
 						if ( is_string( $type ) ) {
 							$msg = $context->msg( "api-help-param-type-$type" );
 							if ( !$msg->isDisabled() ) {