Bug fix on Cache TTL = null

getgrav · Jan 19, 2018 · 8d39fdf · 8d39fdf
1 parent 73bd402
commit 8d39fdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/system/src/Grav/Common/Markdown/ParsedownExtra.php b/system/src/Grav/Common/Markdown/ParsedownExtra.php
@@ -17,10 +17,12 @@ class ParsedownExtra extends \ParsedownExtra
      *
      * @param $page
      * @param $defaults
+     * @throws \Exception
      */
     public function __construct($page, $defaults)
     {
         parent::__construct();
+
         $this->init($page, $defaults);
     }
 }
diff --git a/system/src/Grav/Framework/Cache/CacheTrait.php b/system/src/Grav/Framework/Cache/CacheTrait.php
@@ -85,7 +85,7 @@ public function set($key, $value, $ttl = null)
         $ttl = $this->convertTtl($ttl);
 
         // If a negative or zero TTL is provided, the item MUST be deleted from the cache.
-        return $ttl <= 0 ? $this->doDelete($key) : $this->doSet($key, $value, $ttl);
+        return null !== $ttl && $ttl <= 0 ? $this->doDelete($key) : $this->doSet($key, $value, $ttl);
     }
 
     /**
@@ -175,7 +175,7 @@ public function setMultiple($values, $ttl = null)
         $ttl = $this->convertTtl($ttl);
 
         // If a negative or zero TTL is provided, the item MUST be deleted from the cache.
-        return $ttl <= 0 ? $this->doDeleteMultiple($keys) : $this->doSetMultiple($values, $ttl);
+        return null !== $ttl && $ttl <= 0 ? $this->doDeleteMultiple($keys) : $this->doSetMultiple($values, $ttl);
     }
 
     /**