X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiExpandTemplates.php;h=72adaf8618b698cbf041a85372937df40ed59193;hb=46fdbb4c0ee144300e0cf277fde286136aea674d;hp=6112534cf20d80193dae1b8d1ba670f001b7871d;hpb=d24b74ce2db24799dbaa2abe0277a48694ad2ebd;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php index 6112534cf2..72adaf8618 100644 --- a/includes/api/ApiExpandTemplates.php +++ b/includes/api/ApiExpandTemplates.php @@ -80,10 +80,6 @@ class ApiExpandTemplates extends ApiBase { $retval = array(); if ( isset( $prop['parsetree'] ) || $params['generatexml'] ) { - if ( !isset( $prop['parsetree'] ) ) { - $this->logFeatureUsage( 'action=expandtemplates&generatexml' ); - } - $wgParser->startExternalParse( $title_obj, $options, Parser::OT_PREPROCESS ); $dom = $wgParser->preprocessToDom( $params['text'] ); if ( is_callable( array( $dom, 'saveXML' ) ) ) { @@ -119,7 +115,7 @@ class ApiExpandTemplates extends ApiBase { foreach ( $categories as $category => $sortkey ) { $entry = array(); $entry['sortkey'] = $sortkey; - ApiResult::setContentValue( $entry, 'category', $category ); + ApiResult::setContentValue( $entry, 'category', (string)$category ); $categories_result[] = $entry; } ApiResult::setIndexedTagName( $categories_result, 'category' );