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 e8f1fede77.

Change-Id: I2cfdc84b92cf13478b9f462028d525e4ec14fdf2
This commit is contained in:
Kevin Israel 2014-06-24 04:43:31 -04:00
parent f8067de9fc
commit 1402236c4b
3 changed files with 2 additions and 3 deletions

View file

@ -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() );

View file

@ -1627,7 +1627,6 @@ class OutputPage extends ContextSource {
* @param ParserOutput $parserOutput
*/
public function addParserOutputNoText( &$parserOutput ) {
wfDeprecated( __METHOD__, '1.24' );
$this->addParserOutputMetadata( $parserOutput );
}

View file

@ -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() );