Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ApiResult::setContent is static

Browse source 
Change-Id: Ifee10208e8b79928ecaa47f541bb61dd6e9c29e4
This commit is contained in:
umherirrender 2013-04-30 20:16:36 +02:00
parent 37b539d932
commit e36883264f
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/api/ApiExpandTemplates.php
View file

@ -65,14 +65,14 @@ class ApiExpandTemplates extends ApiBase {
$xml = $dom->__toString();
}
$xml_result = array();
$result->setContent( $xml_result, $xml );
ApiResult::setContent( $xml_result, $xml );
$result->addValue( null, 'parsetree', $xml_result );
}
$retval = $wgParser->preprocess( $params['text'], $title_obj, $options );
// Return result
$retval_array = array();
$result->setContent( $retval_array, $retval );
ApiResult::setContent( $retval_array, $retval );
$result->addValue( null, $this->getModuleName(), $retval_array );
}

4
includes/api/ApiParamInfo.php
View file

@ -149,7 +149,7 @@ class ApiParamInfo extends ApiBase {
$item = array();
if ( is_numeric( $k ) ) {
$retval['examples'] .= $v;
$result->setContent( $item, $v );
ApiResult::setContent( $item, $v );
} else {
if ( !is_array( $v ) ) {
$item['description'] = $v;
@ -157,7 +157,7 @@ class ApiParamInfo extends ApiBase {
$item['description'] = implode( $v, "\n" );
}
$retval['examples'] .= $item['description'] . ' ' . $k;
$result->setContent( $item, $k );
ApiResult::setContent( $item, $k );
}
$retval['allexamples'][] = $item;
}

34
includes/api/ApiParse.php
View file

@ -194,10 +194,10 @@ class ApiParse extends ApiBase {
// Build a result and bail out
$result_array = array();
$result_array['text'] = array();
$result->setContent( $result_array['text'], $this->pstContent->serialize( $format ) );
ApiResult::setContent( $result_array['text'], $this->pstContent->serialize( $format ) );
if ( isset( $prop['wikitext'] ) ) {
$result_array['wikitext'] = array();
$result->setContent( $result_array['wikitext'], $this->content->serialize( $format ) );
ApiResult::setContent( $result_array['wikitext'], $this->content->serialize( $format ) );
}
$result->addValue( null, $this->getModuleName(), $result_array );
return;
@ -225,12 +225,12 @@ class ApiParse extends ApiBase {
if ( isset( $prop['text'] ) ) {
$result_array['text'] = array();
$result->setContent( $result_array['text'], $p_result->getText() );
ApiResult::setContent( $result_array['text'], $p_result->getText() );
}
if ( !is_null( $params['summary'] ) ) {
$result_array['parsedsummary'] = array();
$result->setContent( $result_array['parsedsummary'], Linker::formatComment( $params['summary'], $titleObj ) );
ApiResult::setContent( $result_array['parsedsummary'], Linker::formatComment( $params['summary'], $titleObj ) );
}
if ( isset( $prop['langlinks'] ) || isset( $prop['languageshtml'] ) ) {
@ -253,7 +253,7 @@ class ApiParse extends ApiBase {
$languagesHtml = $this->languagesHtml( $langlinks );
$result_array['languageshtml'] = array();
$result->setContent( $result_array['languageshtml'], $languagesHtml );
ApiResult::setContent( $result_array['languageshtml'], $languagesHtml );
}
if ( isset( $prop['categories'] ) ) {
$result_array['categories'] = $this->formatCategoryLinks( $p_result->getCategories() );
@ -261,7 +261,7 @@ class ApiParse extends ApiBase {
if ( isset( $prop['categorieshtml'] ) ) {
$categoriesHtml = $this->categoriesHtml( $p_result->getCategories() );
$result_array['categorieshtml'] = array();
$result->setContent( $result_array['categorieshtml'], $categoriesHtml );
ApiResult::setContent( $result_array['categorieshtml'], $categoriesHtml );
}
if ( isset( $prop['links'] ) ) {
$result_array['links'] = $this->formatLinks( $p_result->getLinks() );
@ -302,7 +302,7 @@ class ApiParse extends ApiBase {
if ( isset( $prop['headhtml'] ) ) {
$result_array['headhtml'] = array();
$result->setContent( $result_array['headhtml'], $context->getOutput()->headElement( $context->getSkin() ) );
ApiResult::setContent( $result_array['headhtml'], $context->getOutput()->headElement( $context->getSkin() ) );
}
}
@ -312,10 +312,10 @@ class ApiParse extends ApiBase {
if ( isset( $prop['wikitext'] ) ) {
$result_array['wikitext'] = array();
$result->setContent( $result_array['wikitext'], $this->content->serialize( $format ) );
ApiResult::setContent( $result_array['wikitext'], $this->content->serialize( $format ) );
if ( !is_null( $this->pstContent ) ) {
$result_array['psttext'] = array();
$result->setContent( $result_array['psttext'], $this->pstContent->serialize( $format ) );
ApiResult::setContent( $result_array['psttext'], $this->pstContent->serialize( $format ) );
}
}
if ( isset( $prop['properties'] ) ) {
@ -335,7 +335,7 @@ class ApiParse extends ApiBase {
$xml = $dom->__toString();
}
$result_array['parsetree'] = array();
$result->setContent( $result_array['parsetree'], $xml );
ApiResult::setContent( $result_array['parsetree'], $xml );
}
$result_mapping = array(
@ -414,7 +414,7 @@ class ApiParse extends ApiBase {
if ( $title ) {
$entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT );
}
$this->getResult()->setContent( $entry, $bits[1] );
ApiResult::setContent( $entry, $bits[1] );
$result[] = $entry;
}
return $result;
@ -425,7 +425,7 @@ class ApiParse extends ApiBase {
foreach ( $links as $link => $sortkey ) {
$entry = array();
$entry['sortkey'] = $sortkey;
$this->getResult()->setContent( $entry, $link );
ApiResult::setContent( $entry, $link );
$result[] = $entry;
}
return $result;
@ -479,7 +479,7 @@ class ApiParse extends ApiBase {
foreach ( $nslinks as $title => $id ) {
$entry = array();
$entry['ns'] = $ns;
$this->getResult()->setContent( $entry, Title::makeTitle( $ns, $title )->getFullText() );
ApiResult::setContent( $entry, Title::makeTitle( $ns, $title )->getFullText() );
if ( $id != 0 ) {
$entry['exists'] = '';
}
@ -501,7 +501,7 @@ class ApiParse extends ApiBase {
$entry['url'] = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT );
}
$this->getResult()->setContent( $entry, $title->getFullText() );
ApiResult::setContent( $entry, $title->getFullText() );
$result[] = $entry;
}
}
@ -513,7 +513,7 @@ class ApiParse extends ApiBase {
foreach ( $headItems as $tag => $content ) {
$entry = array();
$entry['tag'] = $tag;
$this->getResult()->setContent( $entry, $content );
ApiResult::setContent( $entry, $content );
$result[] = $entry;
}
return $result;
@ -524,7 +524,7 @@ class ApiParse extends ApiBase {
foreach ( $properties as $name => $value ) {
$entry = array();
$entry['name'] = $name;
$this->getResult()->setContent( $entry, $value );
ApiResult::setContent( $entry, $value );
$result[] = $entry;
}
return $result;
@ -535,7 +535,7 @@ class ApiParse extends ApiBase {
foreach ( $css as $file => $link ) {
$entry = array();
$entry['file'] = $file;
$this->getResult()->setContent( $entry, $link );
ApiResult::setContent( $entry, $link );
$result[] = $entry;
}
return $result;

2
includes/api/ApiQueryAllCategories.php
View file

@ -121,7 +121,7 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
$pages[] = $titleObj;
} else {
$item = array();
$result->setContent( $item, $titleObj->getText() );
ApiResult::setContent( $item, $titleObj->getText() );
if ( isset( $prop['size'] ) ) {
$item['size'] = intval( $row->cat_pages );
$item['pages'] = $row->cat_pages - $row->cat_subcats - $row->cat_files;