Drop OpenSearch::getOpenSearchTemplate(), deprecated in 1.25

Change-Id: Ib76b96cf392b7f9fa38d28173dd2cd170e08a881

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 186d8ab..557760d 100644 (file)
--- 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 7ac24c5..7e6e8e6 100644 (file)
--- 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