Merge branch 'allow-hydration-from-stache-indexes' into consolidated-…

…items-wip
statamic · Mar 30, 2024 · ab34d6a · ab34d6a
2 parents e82284c + d66d2bc
commit ab34d6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Stache/Stores/BasicStore.php b/src/Stache/Stores/BasicStore.php
@@ -86,7 +86,7 @@ protected function getCachedItem($key)
             foreach ($item->receivesIndexValues() as $index) {
                 Stache::itemUsingIndexValues($index, $item);
 
-                $value = $this->resolveIndex($index)->get($id);
+                $value = $this->resolveIndex($index)->load()->get($id);
 
                 if ($value) {
                     $item->withIndexedValue($index, $value);

diff --git a/src/Structures/Page.php b/src/Structures/Page.php
@@ -443,7 +443,7 @@ public function routeData()
             return $this->routeData;
         }
 
-        return $this->routeData = $this->entry()->routeData();
+        return $this->routeData = $this->entry()?->routeData() ?? [];
     }
 
     public function published()