Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-22 22:51:13 +01:00
Code Issues Packages Projects Releases Activity

fix and optimize the cache lifetime settings

Browse Source
This commit is contained in:
Andy Miller
2015-01-09 08:06:34 -07:00
parent bd702b4c21
commit d40a71757b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
system/src/Grav/Common/Cache.php
View File

@@ -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;
}
}