jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401794 )
Change subject: Deprecate old interwiki search result widget
......................................................................
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
---
M includes/specials/SpecialSearch.php
M includes/widget/search/SimpleSearchResultSetWidget.php
M includes/widget/search/SimpleSearchResultWidget.php
3 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
DCausse: Looks good to me, approved
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index b3a58cb..f826844 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -394,7 +394,8 @@
$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
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/widget/search/SimpleSearchResultSetWidget.php
@@ -13,6 +13,8 @@
* 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 @@
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
--- a/includes/widget/search/SimpleSearchResultWidget.php
+++ b/includes/widget/search/SimpleSearchResultWidget.php
@@ -9,6 +9,8 @@
/**
* Renders a simple one-line result
+ *
+ * @deprecated since 1.31. Use other result widgets.
*/
class SimpleSearchResultWidget implements SearchResultWidget {
/** @var SpecialSearch */
@@ -17,6 +19,7 @@
protected $linkRenderer;
public function __construct( SpecialSearch $specialSearch, LinkRenderer
$linkRenderer ) {
+ wfDeprecated( __METHOD__, '1.31' );
$this->specialSearch = $specialSearch;
$this->linkRenderer = $linkRenderer;
}
--
To view, visit https://gerrit.wikimedia.org/r/401794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80d8375bbd3e1fabc9b2432b6875d17a96aee099
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
