Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/361612 )
Change subject: DidYouMeanWidget: Don't use deprecated Linker::linkKnown() ...................................................................... DidYouMeanWidget: Don't use deprecated Linker::linkKnown() Change-Id: Ie5464c9d8e3207e7d307bbd31f3c3026ac18fcf2 --- M includes/widget/search/DidYouMeanWidget.php 1 file changed, 10 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/12/361612/1 diff --git a/includes/widget/search/DidYouMeanWidget.php b/includes/widget/search/DidYouMeanWidget.php index 3aee87b..4e5b76b 100644 --- a/includes/widget/search/DidYouMeanWidget.php +++ b/includes/widget/search/DidYouMeanWidget.php @@ -2,7 +2,7 @@ namespace MediaWiki\Widget\Search; -use Linker; +use HtmlArmor; use SearchResultSet; use SpecialSearch; @@ -53,18 +53,20 @@ ]; $stParams = array_merge( $params, $this->specialSearch->powerSearchOptions() ); - $rewritten = Linker::linkKnown( + $linkRenderer = $this->specialSearch->getLinkRenderer(); + $snippet = $resultSet->getQueryAfterRewriteSnippet(); + $rewritten = $linkRenderer->makeKnownLink( $this->specialSearch->getPageTitle(), - $resultSet->getQueryAfterRewriteSnippet() ?: null, + $snippet ? new HtmlArmor( $snippet ) : null, [ 'id' => 'mw-search-DYM-rewritten' ], $stParams ); $stParams['search'] = $term; $stParams['runsuggestion'] = 0; - $original = Linker::linkKnown( + $original = $linkRenderer->makeKnownLink( $this->specialSearch->getPageTitle(), - htmlspecialchars( $term, ENT_QUOTES, 'UTF-8' ), + $term, [ 'id' => 'mwsearch-DYM-original' ], $stParams ); @@ -89,9 +91,10 @@ ]; $stParams = array_merge( $params, $this->specialSearch->powerSearchOptions() ); - $suggest = Linker::linkKnown( + $snippet = $resultSet->getSuggestionSnippet(); + $suggest = $this->specialSearch->getLinkRenderer()->makeKnownLink( $this->specialSearch->getPageTitle(), - $resultSet->getSuggestionSnippet() ?: null, + $snippet ? new HtmlArmor( $snippet ) : null, [ 'id' => 'mw-search-DYM-suggestion' ], $stParams ); -- To view, visit https://gerrit.wikimedia.org/r/361612 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5464c9d8e3207e7d307bbd31f3c3026ac18fcf2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Legoktm <lego...@member.fsf.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits