From 5f018dd6a41ebba9cd8383e6be12f5ce010281e3 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Tue, 6 Mar 2018 17:08:09 +0000 Subject: [PATCH] Drop OpenSearch::getOpenSearchTemplate(), deprecated in 1.25 Change-Id: Ib76b96cf392b7f9fa38d28173dd2cd170e08a881 --- RELEASE-NOTES-1.31 | 2 ++ includes/search/SearchEngine.php | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31 index 186d8ab70a..557760d04b 100644 --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@ -289,6 +289,8 @@ changes to languages because of Phabricator reports. * StripState::merge() * The "free" class is now only applied to unbracketed URLs in wikitext. Links written using square brackets will get the class "text" not "free". +* OpenSearch::getOpenSearchTemplate(), deprecated in 1.25, has been removed. You + can use ApiOpenSearch::getOpenSearchTemplate() instead. == Compatibility == MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported, diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index 7ac24c5d25..7e6e8e6d0d 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -406,17 +406,6 @@ abstract class SearchEngine { // no-op } - /** - * Get OpenSearch suggestion template - * - * @deprecated since 1.25 - * @return string - */ - public static function getOpenSearchTemplate() { - wfDeprecated( __METHOD__, '1.25' ); - return ApiOpenSearch::getOpenSearchTemplate( 'application/x-suggestions+json' ); - } - /** * Get the raw text for updating the index from a content object * Nicer search backends could possibly do something cooler than -- 2.20.1