Convert SearchResultSet to typical iteration

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

diff --git a/includes/widget/search/BasicSearchResultSetWidget.php b/includes/widget/search/BasicSearchResultSetWidget.php
index bf59fe9..8521e68 100644 (file)
--- a/includes/widget/search/BasicSearchResultSetWidget.php
+++ b/includes/widget/search/BasicSearchResultSetWidget.php
@@ -107,10 +107,9 @@ class BasicSearchResultSetWidget {
         * @return string HTML
         */
        protected function header( Message $msg ) {
-               return
-                       "<h2>" .
-                               "<span class='mw-headline'>" . $msg->escaped() . "</span>" .
-                       "</h2>";
+               return "<h2>" .
+                       "<span class='mw-headline'>" . $msg->escaped() . "</span>" .
+               "</h2>";
        }
 
        /**
@@ -124,10 +123,8 @@ class BasicSearchResultSetWidget {
                $terms = $wgContLang->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>";