Merge branch 'master' into fix/where-json-contains

statamic · Nov 12, 2024 · efb7cb4 · efb7cb4
2 parents f2f2338 + 0d2403d
commit efb7cb4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Search/QueryBuilder.php b/src/Search/QueryBuilder.php
@@ -52,6 +52,11 @@ public function getBaseItems()
     {
         $results = $this->getSearchResults($this->query);
 
+        return $this->transformResults($results);
+    }
+
+    public function transformResults($results)
+    {
         if (! $this->withData) {
             return $this->collect($results)
                 ->map(fn ($result) => new PlainResult($result))

diff --git a/src/StaticCaching/NoCache/Session.php b/src/StaticCaching/NoCache/Session.php
@@ -123,7 +123,7 @@ public function restore()
     {
         $session = StaticCache::cacheStore()->get('nocache::session.'.md5($this->url));
 
-        $this->regions = $this->regions->merge($session['regions'] ?? []);
+        $this->regions = $this->regions->merge($session['regions'] ?? [])->unique()->values();
         $this->cascade = $this->restoreCascade();
 
         $this->resolvePageAndPathForPagination();