From 1397b21b847794ecce4825f0df52742871598991 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Thu, 13 Apr 2017 15:54:44 -0700 Subject: [PATCH] OutputPage: Remove deprecated addParserOutputNoText, getHeadLinks methods Change-Id: Idc55e7bb0f7bde8466192a81886f205de60c092c --- RELEASE-NOTES-1.30 | 2 ++ includes/OutputPage.php | 21 --------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30 index d7c0d25190..d32db34cf1 100644 --- a/RELEASE-NOTES-1.30 +++ b/RELEASE-NOTES-1.30 @@ -67,6 +67,8 @@ changes to languages because of Phabricator reports. * File::getStreamHeaders() was deprecated. * MediaHandler::getStreamHeaders() was deprecated. * The ExtractThumbParameters hook (deprecated in 1.21) was removed. +* The OutputPage::addParserOutputNoText and ::getHeadLinks methods (both + deprecated in 1.24) were removed. == Compatibility == MediaWiki 1.30 requires PHP 5.5.9 or later. There is experimental support for diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 85610b9a5b..84a168b5e7 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1773,17 +1773,6 @@ class OutputPage extends ContextSource { $this->addParserOutput( $parserOutput ); } - /** - * Add a ParserOutput object, but without Html. - * - * @deprecated since 1.24, use addParserOutputMetadata() instead. - * @param ParserOutput $parserOutput - */ - public function addParserOutputNoText( $parserOutput ) { - wfDeprecated( __METHOD__, '1.24' ); - $this->addParserOutputMetadata( $parserOutput ); - } - /** * Add all metadata associated with a ParserOutput object, but without the actual HTML. This * includes categories, language links, ResourceLoader modules, effects of certain magic words, @@ -3560,16 +3549,6 @@ class OutputPage extends ContextSource { return $tags; } - /** - * @return string HTML tag links to be put in the header. - * @deprecated since 1.24 Use OutputPage::headElement or if you have to, - * OutputPage::getHeadLinksArray directly. - */ - public function getHeadLinks() { - wfDeprecated( __METHOD__, '1.24' ); - return implode( "\n", $this->getHeadLinksArray() ); - } - /** * Generate a "" for a feed. * -- 2.20.1