dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Replace dev.w3.org with more permanent or stable urls"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiParamInfo.php
diff --git
a/includes/api/ApiParamInfo.php
b/includes/api/ApiParamInfo.php
index
07670f6
..
b74d528
100644
(file)
--- a/
includes/api/ApiParamInfo.php
+++ b/
includes/api/ApiParamInfo.php
@@
-37,8
+37,6
@@
class ApiParamInfo extends ApiBase {
}
public function execute() {
}
public function execute() {
- global $wgContLang;
-
// Get parameters
$params = $this->extractRequestParams();
// Get parameters
$params = $this->extractRequestParams();
@@
-131,8
+129,9
@@
class ApiParamInfo extends ApiBase {
* @param array $res Result array
* @param string $key Result key
* @param Message[] $msgs
* @param array $res Result array
* @param string $key Result key
* @param Message[] $msgs
+ * @param bool $joinLists
*/
*/
- protected function formatHelpMessages( array &$res, $key, array $msgs ) {
+ protected function formatHelpMessages( array &$res, $key, array $msgs
, $joinLists = false
) {
switch ( $this->helpFormat ) {
case 'none':
break;
switch ( $this->helpFormat ) {
case 'none':
break;
@@
-143,6
+142,9
@@
class ApiParamInfo extends ApiBase {
$ret[] = $m->setContext( $this->context )->text();
}
$res[$key] = join( "\n\n", $ret );
$ret[] = $m->setContext( $this->context )->text();
}
$res[$key] = join( "\n\n", $ret );
+ if ( $joinLists ) {
+ $res[$key] = preg_replace( '!^(([*#:;])[^\n]*)\n\n(?=\2)!m', "$1\n", $res[$key] );
+ }
break;
case 'html':
break;
case 'html':
@@
-150,16
+152,24
@@
class ApiParamInfo extends ApiBase {
foreach ( $msgs as $m ) {
$ret[] = $m->setContext( $this->context )->parseAsBlock();
}
foreach ( $msgs as $m ) {
$ret[] = $m->setContext( $this->context )->parseAsBlock();
}
- $res[$key] = join( "\n", $ret );
+ $ret = join( "\n", $ret );
+ if ( $joinLists ) {
+ $ret = preg_replace( '!\s*</([oud]l)>\s*<\1>\s*!', "\n", $ret );
+ }
+ $res[$key] = $ret;
break;
case 'raw':
$res[$key] = array();
foreach ( $msgs as $m ) {
break;
case 'raw':
$res[$key] = array();
foreach ( $msgs as $m ) {
- $
res[$key][]
= array(
+ $
a
= array(
'key' => $m->getKey(),
'params' => $m->getParams(),
);
'key' => $m->getKey(),
'params' => $m->getParams(),
);
+ if ( $m instanceof ApiHelpParamValueMessage ) {
+ $a['forvalue'] = $m->getParamValue();
+ }
+ $res[$key][] = $a;
}
$this->getResult()->setIndexedTagName( $res[$key], 'msg' );
break;
}
$this->getResult()->setIndexedTagName( $res[$key], 'msg' );
break;
@@
-234,7
+244,7
@@
class ApiParamInfo extends ApiBase {
'name' => $name
);
if ( isset( $paramDesc[$name] ) ) {
'name' => $name
);
if ( isset( $paramDesc[$name] ) ) {
- $this->formatHelpMessages( $item, 'description', $paramDesc[$name] );
+ $this->formatHelpMessages( $item, 'description', $paramDesc[$name]
, true
);
}
if ( !empty( $settings[ApiBase::PARAM_REQUIRED] ) ) {
}
if ( !empty( $settings[ApiBase::PARAM_REQUIRED] ) ) {
@@
-331,6
+341,7
@@
class ApiParamInfo extends ApiBase {
$this->context->msg( "apihelp-{$path}-paraminfo-{$tag}" )
->numParams( count( $i ) )
->params( $this->context->getLanguage()->commaList( $i ) )
$this->context->msg( "apihelp-{$path}-paraminfo-{$tag}" )
->numParams( count( $i ) )
->params( $this->context->getLanguage()->commaList( $i ) )
+ ->params( $module->getModulePrefix() )
) );
$result->setSubelements( $info, 'text' );
$item['info'][] = $info;
) );
$result->setSubelements( $info, 'text' );
$item['info'][] = $info;