1 files changed, 94 insertions, 26 deletions

diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php
index d5c789c3..8a3b534d 100644
--- a/includes/api/ApiExpandTemplates.php
+++ b/includes/api/ApiExpandTemplates.php
@@ -39,6 +39,18 @@ class ApiExpandTemplates extends ApiBase {
 
 		// Get parameters
 		$params = $this->extractRequestParams();
+		$this->requireMaxOneParameter( $params, 'prop', 'generatexml' );
+
+		if ( $params['prop'] === null ) {
+			$this->logFeatureUsage( 'action=expandtemplates&!prop' );
+			$this->setWarning( 'Because no values have been specified for the prop parameter, a ' .
+				'legacy format has been used for the output. This format is deprecated, and in ' .
+				'the future, a default value will be set for the prop parameter, causing the new' .
+				'format to always be used.' );
+			$prop = array();
+		} else {
+			$prop = array_flip( $params['prop'] );
+		}
 
 		// Create title for parser
 		$title_obj = Title::newFromText( $params['title'] );
@@ -56,7 +68,13 @@ class ApiExpandTemplates extends ApiBase {
 			$options->setRemoveComments( false );
 		}
 
-		if ( $params['generatexml'] ) {
+		$retval = array();
+
+		if ( isset( $prop['parsetree'] ) || $params['generatexml'] ) {
+			if ( !isset( $prop['parsetree'] ) ) {
+				$this->logFeatureUsage( 'action=expandtemplates&generatexml' );
+			}
+
 			$wgParser->startExternalParse( $title_obj, $options, OT_PREPROCESS );
 			$dom = $wgParser->preprocessToDom( $params['text'] );
 			if ( is_callable( array( $dom, 'saveXML' ) ) ) {
@@ -64,16 +82,54 @@ class ApiExpandTemplates extends ApiBase {
 			} else {
 				$xml = $dom->__toString();
 			}
-			$xml_result = array();
-			ApiResult::setContent( $xml_result, $xml );
-			$result->addValue( null, 'parsetree', $xml_result );
+			if ( isset( $prop['parsetree'] ) ) {
+				unset( $prop['parsetree'] );
+				$retval['parsetree'] = $xml;
+			} else {
+				// the old way
+				$xml_result = array();
+				ApiResult::setContent( $xml_result, $xml );
+				$result->addValue( null, 'parsetree', $xml_result );
+			}
 		}
-		$retval = $wgParser->preprocess( $params['text'], $title_obj, $options );
 
-		// Return result
-		$retval_array = array();
-		ApiResult::setContent( $retval_array, $retval );
-		$result->addValue( null, $this->getModuleName(), $retval_array );
+		// if they didn't want any output except (probably) the parse tree,
+		// then don't bother actually fully expanding it
+		if ( $prop || $params['prop'] === null ) {
+			$wgParser->startExternalParse( $title_obj, $options, OT_PREPROCESS );
+			$frame = $wgParser->getPreprocessor()->newFrame();
+			$wikitext = $wgParser->preprocess( $params['text'], $title_obj, $options, null, $frame );
+			if ( $params['prop'] === null ) {
+				// the old way
+				ApiResult::setContent( $retval, $wikitext );
+			} else {
+				if ( isset( $prop['categories'] ) ) {
+					$categories = $wgParser->getOutput()->getCategories();
+					if ( !empty( $categories ) ) {
+						$categories_result = array();
+						foreach ( $categories as $category => $sortkey ) {
+							$entry = array();
+							$entry['sortkey'] = $sortkey;
+							ApiResult::setContent( $entry, $category );
+							$categories_result[] = $entry;
+						}
+						$result->setIndexedTagName( $categories_result, 'category' );
+						$retval['categories'] = $categories_result;
+					}
+				}
+				if ( isset( $prop['volatile'] ) && $frame->isVolatile() ) {
+					$retval['volatile'] = '';
+				}
+				if ( isset( $prop['ttl'] ) && $frame->getTTL() !== null ) {
+					$retval['ttl'] = $frame->getTTL();
+				}
+				if ( isset( $prop['wikitext'] ) ) {
+					$retval['wikitext'] = $wikitext;
+				}
+			}
+		}
+		$result->setSubelements( $retval, array( 'wikitext', 'parsetree' ) );
+		$result->addValue( null, $this->getModuleName(), $retval );
 	}
 
 	public function getAllowedParams() {
@@ -85,8 +141,21 @@ class ApiExpandTemplates extends ApiBase {
 				ApiBase::PARAM_TYPE => 'string',
 				ApiBase::PARAM_REQUIRED => true,
 			),
-			'generatexml' => false,
+			'prop' => array(
+				ApiBase::PARAM_TYPE => array(
+					'wikitext',
+					'categories',
+					'volatile',
+					'ttl',
+					'parsetree',
+				),
+				ApiBase::PARAM_ISMULTI => true,
+			),
 			'includecomments' => false,
+			'generatexml' => array(
+				ApiBase::PARAM_TYPE => 'boolean',
+				ApiBase::PARAM_DEPRECATED => true,
+			),
 		);
 	}
 
@@ -94,27 +163,26 @@ class ApiExpandTemplates extends ApiBase {
 		return array(
 			'text' => 'Wikitext to convert',
 			'title' => 'Title of page',
-			'generatexml' => 'Generate XML parse tree',
+			'prop' => array(
+				'Which pieces of information to get',
+				' wikitext   - The expanded wikitext',
+				' categories - Any categories present in the input that are not represented in ' .
+					'the wikitext output',
+				' volatile   - Whether the output is volatile and should not be reused ' .
+					'elsewhere within the page',
+				' ttl        - The maximum time after which caches of the result should be ' .
+					'invalidated',
+				' parsetree  - The XML parse tree of the input',
+				'Note that if no values are selected, the result will contain the wikitext,',
+				'but the output will be in a deprecated format.',
+			),
 			'includecomments' => 'Whether to include HTML comments in the output',
-		);
-	}
-
-	public function getResultProperties() {
-		return array(
-			'' => array(
-				'*' => 'string'
-			)
+			'generatexml' => 'Generate XML parse tree (replaced by prop=parsetree)',
 		);
 	}
 
 	public function getDescription() {
-		return 'Expands all templates in wikitext';
-	}
-
-	public function getPossibleErrors() {
-		return array_merge( parent::getPossibleErrors(), array(
-			array( 'invalidtitle', 'title' ),
-		) );
+		return 'Expands all templates in wikitext.';
 	}
 
 	public function getExamples() {