summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-08-11 14:14:33 +0200
committerGitHub <noreply@github.com>2016-08-11 14:14:33 +0200
commitd864eb4828a1a4c327df1af4e84328a8dfd0be43 (patch)
treeee49e325d06fcd11f9e8c0427474005b8a0b3ae9 /system/libraries
parentc82e9968326b949d4cdad384f4645b28fa7c2f17 (diff)
parentae31a918a3c0eff331f3ae2f03afca25158e93ff (diff)
Merge pull request #4762 from tianhe1986/develop_cache_file_metadata
Cache_file: use $data['time'] for calculating expired time.
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Cache/drivers/Cache_file.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php
index f579eaae4..93932d4cf 100644
--- a/system/libraries/Cache/drivers/Cache_file.php
+++ b/system/libraries/Cache/drivers/Cache_file.php
@@ -227,13 +227,13 @@ class CI_Cache_file extends CI_Driver {
{
$mtime = filemtime($this->_cache_path.$id);
- if ( ! isset($data['ttl']))
+ if ( ! isset($data['ttl'], $data['time']))
{
return FALSE;
}
return array(
- 'expire' => $mtime + $data['ttl'],
+ 'expire' => $data['time'] + $data['ttl'],
'mtime' => $mtime
);
}