fix(site): fix issue with empty null cache id for error404 page

flextype-plugins · Sep 14, 2022 · 45914a2 · 45914a2
1 parent fb5eec5
commit 45914a2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/core/Site.php b/src/core/Site.php
@@ -47,16 +47,25 @@ public function renderResponse($response, array $data)
      */
     public function render(array $data) 
     {
+        if (isset($data['id'])) {
+            $dataID = $data['id'];
+        } else {
+            $dataID = strings($data['title'] . 
+                              $data['description'] .
+                              $data['content'] .
+                              $data['template'])->hash()->toString();
+        }
+
         if (registry()->get('plugins.site.settings.cache.enabled')) {
             filesystem()->directory(FLEXTYPE_PATH_TMP . '/site/')->ensureExists(0755, true);
 
-            $cacheFileID = FLEXTYPE_PATH_TMP . '/site/' . $this->getCacheID($data['id']) . '.html';
+            $cacheFileID = FLEXTYPE_PATH_TMP . '/site/' . $this->getCacheID($dataID) . '.html';
 
             if (filesystem()->file($cacheFileID)->exists()) {
-                $renderedTemplate = filesystem()->file(FLEXTYPE_PATH_TMP . '/site/' . $this->getCacheID($data['id']) . '.html')->get();
+                $renderedTemplate = filesystem()->file(FLEXTYPE_PATH_TMP . '/site/' . $this->getCacheID($dataID) . '.html')->get();
             } else {
                 $renderedTemplate = $this->fetch($data);
-                filesystem()->file(FLEXTYPE_PATH_TMP . '/site/' . $this->getCacheID($data['id']) . '.html')->put($renderedTemplate);
+                filesystem()->file(FLEXTYPE_PATH_TMP . '/site/' . $this->getCacheID($dataID) . '.html')->put($renderedTemplate);
             }
 
         } else {