Merge "Delete autoload.ide.php"

[lhc/web/wiklou.git] / includes / widget / search / BasicSearchResultSetWidget.php

diff --git a/includes/widget/search/BasicSearchResultSetWidget.php b/includes/widget/search/BasicSearchResultSetWidget.php
index e236640..1a885b0 100644 (file)
--- 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,15 +117,12 @@ class BasicSearchResultSetWidget {
         * @return string HTML
         */
        protected function renderResultSet( SearchResultSet $resultSet, $offset ) {
-               global $wgContLang;
-
-               $terms = $wgContLang->convertForSearchResult( $resultSet->termMatches() );
+               $terms = MediaWikiServices::getInstance()->getContentLanguage()->
+                       convertForSearchResult( $resultSet->termMatches() );
 
                $hits = [];
-               $result = $resultSet->next();
-               while ( $result ) {
-                       $hits[] .= $this->resultWidget->render( $result, $terms, $offset++ );
-                       $result = $resultSet->next();
+               foreach ( $resultSet as $result ) {
+                       $hits[] = $this->resultWidget->render( $result, $terms, $offset++ );
                }
 
                return "<ul class='mw-search-results'>" . implode( '', $hits ) . "</ul>";