Fix nav caching

stuartcusackie · Jul 3, 2022 · d9e321e · d9e321e
1 parent 2cc5ab5
commit d9e321e
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/src/StatamicBladeViewData.php b/src/StatamicBladeViewData.php
@@ -70,25 +70,32 @@ protected function initNavs() {
 
         foreach(config('statamic-blade-view-data.navs') as $handle => $options) {
 
-            if(!empty($options['params']['select'])) {
-                $nav = \Statamic::tag('nav:' . $handle)->params(['select' => $options['params']['select']])->fetch();
-            }
-            else {
-                $nav = \Statamic::tag('nav:' . $handle)->fetch();
-            }
-
             if($options['cache']) {
 
-                Cache::rememberForever('statamic_nav_' . $handle, function() use($nav) {
-                    return $nav;
+                $nav = Cache::rememberForever('statamic_nav_' . $handle, function() use ($handle, $options) {
+                    return $this->getNav($handle, $options);
                 });
 
             }
+            else {
+                $nav = $this->getNav($handle, $options);
+            }
 
             $navs[$handle] = $nav;
         }
 
         return $navs;
 
     }
-}
+
+    protected function getNav($handle, $options) {
+
+        if(!empty($options['params']['select'])) {
+            return \Statamic::tag('nav:' . $handle)->params(['select' => $options['params']['select']])->fetch();
+        }
+        else {
+            return \Statamic::tag('nav:' . $handle)->fetch();
+        }
+
+    }
+}