From: Kevin Israel <pleasestand@live.com>
Date: Tue, 24 Jun 2014 08:43:31 +0000 (-0400)
Subject: Remove use of OutputPage::addParserOutputNoText()
X-Git-Tag: 1.31.0-rc.0~15269
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=1402236c4beb1a98a447ce258a6f332e8f73987a;p=lhc%2Fweb%2Fwiklou.git

Remove use of OutputPage::addParserOutputNoText()

Simply clicking "Show preview" on the edit page triggered a deprecation
warning.

Also removed the wfDeprecated() call from the method, which is still used
in a few WMF-deployed extensions without a corresponding open change.

Follows-up e8f1fede77c5.

Change-Id: I2cfdc84b92cf13478b9f462028d525e4ec14fdf2
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 98e0ec4b5a..480671a214 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3555,7 +3555,7 @@ HTML
 
 			$previewHTML = $parserOutput->getText();
 			$this->mParserOutput = $parserOutput;
-			$wgOut->addParserOutputNoText( $parserOutput );
+			$wgOut->addParserOutputMetadata( $parserOutput );
 
 			if ( count( $parserOutput->getWarnings() ) ) {
 				$note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() );
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 612dc329da..a2b8920a49 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1627,7 +1627,6 @@ class OutputPage extends ContextSource {
 	 * @param ParserOutput $parserOutput
 	 */
 	public function addParserOutputNoText( &$parserOutput ) {
-		wfDeprecated( __METHOD__, '1.24' );
 		$this->addParserOutputMetadata( $parserOutput );
 	}
 
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 86ce1f179c..9dc4d03a39 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -325,7 +325,7 @@ class ApiParse extends ApiBase {
 		if ( isset( $prop['headitems'] ) || isset( $prop['headhtml'] ) ) {
 			$context = $this->getContext();
 			$context->setTitle( $titleObj );
-			$context->getOutput()->addParserOutputNoText( $p_result );
+			$context->getOutput()->addParserOutputMetadata( $p_result );
 
 			if ( isset( $prop['headitems'] ) ) {
 				$headItems = $this->formatHeadItems( $p_result->getHeadItems() );