X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fwidget%2Fsearch%2FBasicSearchResultSetWidget.php;h=0e102878bc702d00113168ba76def2aead771237;hp=8521e68f004f2247eb68371822542c4ddfb8b107;hb=04d1aa3033f40a38d721f7f0e88b5bac440d2869;hpb=3b00273a5a586144babf4902abd2345ff0c23f86

diff --git a/includes/widget/search/BasicSearchResultSetWidget.php b/includes/widget/search/BasicSearchResultSetWidget.php
index 8521e68f00..0e102878bc 100644
--- a/includes/widget/search/BasicSearchResultSetWidget.php
+++ b/includes/widget/search/BasicSearchResultSetWidget.php
@@ -2,6 +2,7 @@
 
 namespace MediaWiki\Widget\Search;
 
+use MediaWiki\MediaWikiServices;
 use Message;
 use SearchResultSet;
 use SpecialSearch;
@@ -42,8 +43,6 @@ class BasicSearchResultSetWidget {
 		SearchResultSet $titleResultSet = null,
 		SearchResultSet $textResultSet = null
 	) {
-		global $wgContLang;
-
 		$hasTitle = $titleResultSet ? $titleResultSet->numRows() > 0 : false;
 		$hasText = $textResultSet ? $textResultSet->numRows() > 0 : false;
 		$hasSecondary = $textResultSet
@@ -95,7 +94,7 @@ class BasicSearchResultSetWidget {
 
 		// Convert the whole thing to desired language variant
 		// TODO: Move this up to Special:Search?
-		return $wgContLang->convert( $out );
+		return MediaWikiServices::getInstance()->getContentLanguage()->convert( $out );
 	}
 
 	/**
@@ -118,13 +117,9 @@ class BasicSearchResultSetWidget {
 	 * @return string HTML
 	 */
 	protected function renderResultSet( SearchResultSet $resultSet, $offset ) {
-		global $wgContLang;
-
-		$terms = $wgContLang->convertForSearchResult( $resultSet->termMatches() );
-
 		$hits = [];
 		foreach ( $resultSet as $result ) {
-			$hits[] = $this->resultWidget->render( $result, $terms, $offset++ );
+			$hits[] = $this->resultWidget->render( $result, $offset++ );
 		}
 
 		return "<ul class='mw-search-results'>" . implode( '', $hits ) . "</ul>";