Merge branch '1.14' into fix_suggestion_init_master

netgen · Oct 20, 2020 · 6ecf6ff · 6ecf6ff
2 parents 6014a70 + d21758b
commit 6ecf6ff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/Core/Pagination/Pagerfanta/BaseAdapter.php b/lib/Core/Pagination/Pagerfanta/BaseAdapter.php
@@ -135,7 +135,11 @@ private function setExtraInfo(SearchResult $searchResult)
         $this->facets = $searchResult->facets;
         $this->maxScore = $searchResult->maxScore;
         $this->nbResults = $searchResult->totalCount;
-        $this->suggestion = $searchResult instanceof ExtraSearchResult ? $searchResult->suggestion : new Suggestion([]);
+        $this->suggestion = new Suggestion([]);
+
+        if ($searchResult instanceof ExtraSearchResult && $searchResult->suggestion instanceof Suggestion) {
+            $this->suggestion = $searchResult->suggestion;
+        }
 
         $this->isExtraInfoInitialized = true;
     }