From 2a806d04290da758e5715d0158d882cf24de10b0 Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Wed, 19 Jun 2019 14:49:22 -0400 Subject: [PATCH] Remove OutputPage::enableSectionEditLinks(), ParserOptions::get/setEditSection() These methods were deprecated in 1.31, and most of the related code was removed in b4e557f8f8a72d4539e0cf5f83add4eef8df418b but these three methods appear to have been overlooked. Change-Id: Iea6c8b1b628a7b6acf9b65497966af9fc4ab662e --- RELEASE-NOTES-1.34 | 7 ++++--- includes/OutputPage.php | 10 ---------- includes/parser/ParserOptions.php | 21 --------------------- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34 index 2f656b8312..7619e6b249 100644 --- a/RELEASE-NOTES-1.34 +++ b/RELEASE-NOTES-1.34 @@ -152,9 +152,10 @@ because of Phabricator reports. * User::makeGroupLinkWiki(), deprecated in 1.29, has been removed. Use UserGroupMembership::getLink() instead. * SavepointPostgres, deprecated in 1.31, has been removed. -* Output::sectionEditLinksEnabled(), ParserOutput::getEditSectionTokens, - ::getTOCEnabled, ::setEditSectionTokens, ::setTOCEnabled, deprecated in 1.31, - have been removed. +* OutputPage::enableSectionEditLinks(), OutputPage::sectionEditLinksEnabled(), + ParserOptions::getEditSection(), ParserOptions::setEditSection(), and + ParserOutput::getEditSectionTokens, ::getTOCEnabled, ::setEditSectionTokens, + and ::setTOCEnabled, deprecated in 1.31, have been removed. * EditPage::safeUnicodeInput() and ::safeUnicodeOutput(), deprecated in 1.30, have been removed. * Four methods in OutputPage, deprecated in 1.32, have been removed. You should diff --git a/includes/OutputPage.php b/includes/OutputPage.php index fba75ecf50..6c49696a2b 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -4017,16 +4017,6 @@ class OutputPage extends ContextSource { return $this->mEnableTOC; } - /** - * Enables/disables section edit links, doesn't override __NOEDITSECTION__ - * @param bool $flag - * @since 1.23 - * @deprecated since 1.31, use $poOptions to addParserOutput() instead. - */ - public function enableSectionEditLinks( $flag = true ) { - wfDeprecated( __METHOD__, '1.31' ); - } - /** * Helper function to setup the PHP implementation of OOUI to use in this request. * diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php index 66b1612245..afd6b2d4c8 100644 --- a/includes/parser/ParserOptions.php +++ b/includes/parser/ParserOptions.php @@ -913,27 +913,6 @@ class ParserOptions { return wfSetVar( $this->mTimestamp, $x ); } - /** - * Create "edit section" links? - * @deprecated since 1.31, use ParserOutput::getText() options instead. - * @return bool - */ - public function getEditSection() { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - - /** - * Create "edit section" links? - * @deprecated since 1.31, use ParserOutput::getText() options instead. - * @param bool|null $x New value (null is no change) - * @return bool Old value - */ - public function setEditSection( $x ) { - wfDeprecated( __METHOD__, '1.31' ); - return true; - } - /** * Set the redirect target. * -- 2.20.1