From d40a71757bcaf7c6028dee889e570f44be29dec5 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 9 Jan 2015 08:06:34 -0700
Subject: [PATCH] fix and optimize the cache lifetime settings

---
 system/src/Grav/Common/Cache.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 99da66cb0..afdadb73e 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -190,7 +190,7 @@ class Cache extends Getters
         if ($this->enabled) {
 
             if ($lifetime == null) {
-                $lifetime = $this->lifetime ?: $this->config->get('system.cache.lifetime') ?: 0;
+                $lifetime = $this->getLifetime();
             }
             $this->driver->save($id, $data, $lifetime);
         }
@@ -283,11 +283,9 @@ class Cache extends Getters
         }
 
         $interval = $future - $this->now;
-        if ($this->lifetime && ($interval > $this->lifetime)) {
+        if ($interval > 0 && $interval < $this->getLifetime()) {
             $this->lifetime = $interval;
-            return;
         }
-        $this->lifetime = $interval;
     }
 
 
@@ -298,6 +296,10 @@ class Cache extends Getters
      */
     public function getLifetime()
     {
+        if ($this->lifetime === null) {
+            $this->lifetime = $this->config->get('system.cache.lifetime') ?: 604800; // 1 week default
+        }
+
         return $this->lifetime;
     }
 }