Merge "Deprecate old interwiki search result widget"

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index b3a58cb..f826844 100644 (file)
--- 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 d6583a3..d0c259f 100644 (file)
--- 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 fa07563..552cbaf 100644 (file)
--- 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;
        }