Revert "Bug #201: Fixed infinite loop"

This reverts commit aa22ffd.

ActiveDataProvider.php

@@ -86,10 +86,6 @@ protected function prepareModels()
         }
 
         $query = clone $this->query;
-
-        $results = $query->search($this->db);
-        $this->setQueryResults(is_array($results) ? $results : []);
-
         if (($pagination = $this->getPagination()) !== false) {
             // pagination fails to validate page number, because total count is unknown at this stage
             $pagination->validatePage = false;
@@ -99,11 +95,15 @@ protected function prepareModels()
             $query->addOrderBy($sort->getOrders());
         }
 
-        if ($pagination !== false) {
-            $pagination->totalCount = $this->getTotalCount();
+        if (is_array(($results = $query->search($this->db)))) {
+            $this->setQueryResults($results);
+            if ($pagination !== false) {
+                $pagination->totalCount = $this->getTotalCount();
+            }
+            return $results['hits']['hits'];
         }
-
-        return $results['hits']['hits'];
+        $this->setQueryResults([]);
+        return [];
     }
 
     /**

CHANGELOG.md

@@ -4,7 +4,6 @@ Yii Framework 2 elasticsearch extension Change Log
 2.0.6 under development
 -----------------------
 
-- Bug #201: Fixed infinite loop (GHopperMSK)
 - Bug #180: Fixed `count()` compatibility with PHP 7.2 to not call it on scalar values (cebe)