From 0aaadad66850ec1760ec7d4729cbb0572bede8c2 Mon Sep 17 00:00:00 2001
From: markseu <mark2011@mayberg.se>
Date: Tue, 12 Apr 2022 19:46:50 +0200
Subject: [PATCH] Updated static cache

---
 .htaccess                            | 2 +-
 system/extensions/command.php        | 4 ++--
 system/extensions/core.php           | 4 ++--
 system/extensions/update-current.ini | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.htaccess b/.htaccess
index 60d737f..9417603 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,7 @@
 <IfModule mod_rewrite.c>
 RewriteEngine on
 DirectoryIndex index.html yellow.php
-RewriteRule ^(cache|content|system)/ error [L]
+RewriteRule ^(content|system)/ error [L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule ^ yellow.php [L]
diff --git a/system/extensions/command.php b/system/extensions/command.php
index 83324f1..272c20b 100644
--- a/system/extensions/command.php
+++ b/system/extensions/command.php
@@ -2,7 +2,7 @@
 // Command extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/command
 
 class YellowCommand {
-    const VERSION = "0.8.33";
+    const VERSION = "0.8.34";
     public $yellow;                       // access to API
     public $files;                        // number of files
     public $links;                        // number of links
@@ -479,6 +479,7 @@ class YellowCommand {
         $ok = false;
         if (!empty($path)) {
             if ($path==rtrim($this->yellow->system->get("commandStaticBuildDirectory"), "/")) $ok = true;
+            if ($path==rtrim($this->yellow->system->get("coreCacheDirectory"), "/")) $ok = true;
             if ($path==rtrim($this->yellow->system->get("coreTrashDirectory"), "/")) $ok = true;
             if (is_file("$path/".$this->yellow->system->get("commandStaticDefaultFile"))) $ok = true;
             if (is_file("$path/yellow.php")) $ok = false;
@@ -602,7 +603,6 @@ class YellowCommand {
         $locations = array();
         $pathIgnore = "($path/|".
             $this->yellow->system->get("commandStaticBuildDirectory")."|".
-            $this->yellow->system->get("coreCacheDirectory")."|".
             $this->yellow->system->get("coreContentDirectory")."|".
             $this->yellow->system->get("coreMediaDirectory")."|".
             $this->yellow->system->get("coreSystemDirectory").")";
diff --git a/system/extensions/core.php b/system/extensions/core.php
index 1e7c70f..bc1f1db 100644
--- a/system/extensions/core.php
+++ b/system/extensions/core.php
@@ -2,7 +2,7 @@
 // Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 
 class YellowCore {
-    const VERSION = "0.8.64";
+    const VERSION = "0.8.65";
     const RELEASE = "0.8.19";
     public $page;           // current page
     public $content;        // content files
@@ -47,11 +47,11 @@ class YellowCore {
         $this->system->setDefault("coreDownloadDirectory", "media/downloads/");
         $this->system->setDefault("coreImageDirectory", "media/images/");
         $this->system->setDefault("coreSystemDirectory", "system/");
+        $this->system->setDefault("coreCacheDirectory", "system/cache/");
         $this->system->setDefault("coreExtensionDirectory", "system/extensions/");
         $this->system->setDefault("coreLayoutDirectory", "system/layouts/");
         $this->system->setDefault("coreThemeDirectory", "system/themes/");
         $this->system->setDefault("coreTrashDirectory", "system/trash/");
-        $this->system->setDefault("coreCacheDirectory", "cache/");
         $this->system->setDefault("coreContentDirectory", "content/");
         $this->system->setDefault("coreContentRootDirectory", "default/");
         $this->system->setDefault("coreContentHomeDirectory", "home/");
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
index 7e47cb9..ebae703 100755
--- a/system/extensions/update-current.ini
+++ b/system/extensions/update-current.ini
@@ -11,21 +11,21 @@ Tag: feature
 system/extensions/bundle.php: bundle.php, create, update
 
 Extension: Command
-Version: 0.8.33
+Version: 0.8.34
 Description: Command line of the website.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/command
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/command.zip
-Published: 2022-03-11 00:29:08
+Published: 2022-04-12 17:26:01
 Developer: Datenstrom
 Tag: feature
 system/extensions/command.php: command.php, create, update
 
 Extension: Core
-Version: 0.8.64
+Version: 0.8.65
 Description: Core functionality of the website.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/core.zip
-Published: 2022-04-09 22:53:00
+Published: 2022-04-12 17:24:28
 Developer: Datenstrom
 Tag: feature
 system/extensions/core.php: core.php, create, update