Merge branch 'release/0.9.8'

getgrav · Dec 2, 2014 · d012c8e · d012c8e
2 parents 50940da + e66b89f
commit d012c8e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
     * Added ability to set HTTP status code from page header
     * Implemented simple wild-card custom routing
 2. [](#improved)
-    * Fixed elusive double load to fully cache issue (hopefully!)
+    * Fixed elusive double load to fully cache issue (crossing fingers...)
     * Ensure Twig tags are treated as block items in markdown
     * Removed some older deprecated methods
     * Ensure onPageContentProcessed() event only fires when not cached

diff --git a/system/config/site.yaml b/system/config/site.yaml
@@ -12,3 +12,4 @@ summary:
 routes:
   /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
   /another/one/here: '/blog/sample-3'       # Another alias for /blog/sample-3
+  /new/*: '/blog/*'                         # Wildcard any /new/my-page URL to /blog/my-page Route
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
@@ -73,7 +73,7 @@ public function init(Grav $grav)
         $this->driver = $this->getCacheDriver();
 
         // Set the cache namespace to our unique key
-        // $this->driver->setNamespace($this->key);
+        $this->driver->setNamespace($this->key);
     }
 
     /**

diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
@@ -116,7 +116,7 @@ public function __construct(array $items = array(), Grav $grav = null, $environm
 
     public function key()
     {
-        return $this->checksum;
+        return $this->checksum();
     }
 
     public function reload()