From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Tue, 13 Jun 2017 19:42:21 +0000 (-0400)
Subject: ApiParse: Fetch content with parsetree
X-Git-Tag: 1.31.0-rc.0~2993^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=2775de01c8c67c90fee6efeaeb0b9a08f9620b22

ApiParse: Fetch content with parsetree

I0079e10a assumed callers were correctly passing $getContent to
getParsedContent(). Apparently they weren't.

Bug: T167826
Change-Id: I85cbdfb5d0580252c1df23a0f27c8052f1d65dc3
---

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 402494c617..b2e03c80ee 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -88,6 +88,9 @@ class ApiParse extends ApiBase {
 
 		$redirValues = null;
 
+		$needContent = isset( $prop['wikitext'] ) ||
+			isset( $prop['parsetree'] ) || $params['generatexml'];
+
 		// Return result
 		$result = $this->getResult();
 
@@ -114,7 +117,7 @@ class ApiParse extends ApiBase {
 				$pageObj = WikiPage::factory( $titleObj );
 				list( $popts, $reset, $suppressCache ) = $this->makeParserOptions( $pageObj, $params );
 				$p_result = $this->getParsedContent(
-					$pageObj, $popts, $suppressCache, $pageid, $rev, isset( $prop['wikitext'] )
+					$pageObj, $popts, $suppressCache, $pageid, $rev, $needContent
 				);
 			} else { // Not $oldid, but $pageid or $page
 				if ( $params['redirects'] ) {
@@ -158,7 +161,7 @@ class ApiParse extends ApiBase {
 
 				list( $popts, $reset, $suppressCache ) = $this->makeParserOptions( $pageObj, $params );
 				$p_result = $this->getParsedContent(
-					$pageObj, $popts, $suppressCache, $pageid, null, isset( $prop['wikitext'] )
+					$pageObj, $popts, $suppressCache, $pageid, null, $needContent
 				);
 			}
 		} else { // Not $oldid, $pageid, $page. Hence based on $text