From d95f644e80fb894ca4f22a9fcdeab53cde9dedc9 Mon Sep 17 00:00:00 2001 From: Erik Bernhardson Date: Wed, 3 Jan 2018 12:09:03 -0800 Subject: [PATCH] Deprecate old interwiki search result widget Update the flag for new interwiki sidebar from unset means disabled to unset means enabled. Deprecate the old rendering widgets to be removed at a later date per deprecation policy. Change-Id: I80d8375bbd3e1fabc9b2432b6875d17a96aee099 Related: I9a488438 --- includes/specials/SpecialSearch.php | 3 ++- includes/widget/search/SimpleSearchResultSetWidget.php | 3 +++ includes/widget/search/SimpleSearchResultWidget.php | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index b3a58cbd91..f8268445b1 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -394,7 +394,8 @@ class SpecialSearch extends SpecialPage { $linkRenderer = $this->getLinkRenderer(); $mainResultWidget = new FullSearchResultWidget( $this, $linkRenderer ); - if ( $search->getFeatureData( 'enable-new-crossproject-page' ) ) { + // Default (null) on. Can be explicitly disabled. + if ( $search->getFeatureData( 'enable-new-crossproject-page' ) !== false ) { $sidebarResultWidget = new InterwikiSearchResultWidget( $this, $linkRenderer ); $sidebarResultsWidget = new InterwikiSearchResultSetWidget( $this, diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php b/includes/widget/search/SimpleSearchResultSetWidget.php index d6583a3269..d0c259fea2 100644 --- a/includes/widget/search/SimpleSearchResultSetWidget.php +++ b/includes/widget/search/SimpleSearchResultSetWidget.php @@ -13,6 +13,8 @@ use Html; * Renders one or more SearchResultSets into a sidebar grouped by * interwiki prefix. Includes a per-wiki header indicating where * the results are from. + * + * @deprecated since 1.31. Use InterwikiSearchResultSetWidget */ class SimpleSearchResultSetWidget implements SearchResultSetWidget { /** @var SpecialSearch */ @@ -32,6 +34,7 @@ class SimpleSearchResultSetWidget implements SearchResultSetWidget { LinkRenderer $linkRenderer, InterwikiLookup $iwLookup ) { + wfDeprecated( __METHOD__, '1.31' ); $this->specialSearch = $specialSearch; $this->resultWidget = $resultWidget; $this->linkRenderer = $linkRenderer; diff --git a/includes/widget/search/SimpleSearchResultWidget.php b/includes/widget/search/SimpleSearchResultWidget.php index fa075637a1..552cbaf8ba 100644 --- a/includes/widget/search/SimpleSearchResultWidget.php +++ b/includes/widget/search/SimpleSearchResultWidget.php @@ -9,6 +9,8 @@ use SpecialSearch; /** * Renders a simple one-line result + * + * @deprecated since 1.31. Use other result widgets. */ class SimpleSearchResultWidget implements SearchResultWidget { /** @var SpecialSearch */ @@ -17,6 +19,7 @@ class SimpleSearchResultWidget implements SearchResultWidget { protected $linkRenderer; public function __construct( SpecialSearch $specialSearch, LinkRenderer $linkRenderer ) { + wfDeprecated( __METHOD__, '1.31' ); $this->specialSearch = $specialSearch; $this->linkRenderer = $linkRenderer; } -- 2.20.1