From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 27 Jun 2017 02:17:17 +0000 (-0700)
Subject: DidYouMeanWidget: Don't use deprecated Linker::linkKnown()
X-Git-Tag: 1.31.0-rc.0~2829^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=80761e49abdcfcd29158fa435bc920050ee84725;p=lhc%2Fweb%2Fwiklou.git

DidYouMeanWidget: Don't use deprecated Linker::linkKnown()

Change-Id: Ie5464c9d8e3207e7d307bbd31f3c3026ac18fcf2
---

diff --git a/includes/widget/search/DidYouMeanWidget.php b/includes/widget/search/DidYouMeanWidget.php
index 3aee87bf3b..4e5b76b69a 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 @@ class DidYouMeanWidget {
 		];
 		$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 @@ class DidYouMeanWidget {
 		];
 		$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
 		);