Merge "RevisionStoreDbTestBase, remove redundant needsDB override"

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

diff --git a/includes/widget/search/InterwikiSearchResultSetWidget.php b/includes/widget/search/InterwikiSearchResultSetWidget.php
index 81a1a43..79380de 100644 (file)
--- a/includes/widget/search/InterwikiSearchResultSetWidget.php
+++ b/includes/widget/search/InterwikiSearchResultSetWidget.php
@@ -65,12 +65,10 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
 
                $iwResults = [];
                foreach ( $resultSets as $resultSet ) {
-                       $result = $resultSet->next();
-                       while ( $result ) {
+                       foreach ( $resultSet as $result ) {
                                if ( !$result->isBrokenTitle() ) {
                                        $iwResults[$result->getTitle()->getInterwiki()][] = $result;
                                }
-                               $result = $resultSet->next();
                        }
                }
 
@@ -168,7 +166,7 @@ class InterwikiSearchResultSetWidget implements SearchResultSetWidget {
         *
         * @param string $iwPrefix Interwiki prefix
         * @return OOUI\IconWidget
-        **/
+        */
        protected function iwIcon( $iwPrefix ) {
                $interwiki = $this->iwLookup->fetch( $iwPrefix );
                $parsed = wfParseUrl( wfExpandUrl( $interwiki ? $interwiki->getURL() : '/' ) );