diff --git a/RELEASE-NOTES-1.36 b/RELEASE-NOTES-1.36 index cc93f171e48..a1593966777 100644 --- a/RELEASE-NOTES-1.36 +++ b/RELEASE-NOTES-1.36 @@ -291,6 +291,7 @@ because of Phabricator reports. private: - $mTagHooks - use Parser::getTags() - $mFunctionHooks - use Parser::getFunctionHooks() + - $mOutput - use Parser::getOutput() * The ParserBeforeTidy hook, deprecated in 1.35, has been removed. * The ParserBeforeTidy, ParserBeforeStrip, and ParserAfterStrip hooks, deprecated in 1.35, have been removed. diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index 89c87c5b1ea..5d0da5986ca 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -482,9 +482,9 @@ class CoreParserFunctions { && !$title->hasFragment() && $title->equals( $parser->getTitle() ) ) ) { - $old = $parser->mOutput->getProperty( 'displaytitle' ); + $old = $parser->getOutput()->getProperty( 'displaytitle' ); if ( $old === false || $arg !== 'displaytitle_noreplace' ) { - $parser->mOutput->setDisplayTitle( $text ); + $parser->getOutput()->setDisplayTitle( $text ); } if ( $old !== false && $old !== $text && !$arg ) { diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index c6f9d0eb893..470275b0635 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -185,9 +185,8 @@ class Parser { # Cleared with clearState(): /** * @var ParserOutput - * @deprecated since 1.35; use Parser::getOutput() */ - public $mOutput; + private $mOutput; private $mAutonumber; /** @@ -1018,6 +1017,7 @@ class Parser { /** * @return ParserOutput + * @since 1.12.2 */ public function getOutput() { return $this->mOutput;