summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-08-11 14:14:33 +0200
committerAndrey Andreev <narf@devilix.net>2016-08-11 14:15:25 +0200
commit9514dc35154cdfd5e3380976a37c8a3640413e48 (patch)
treea65153532b11a4702511acf56a1b4037d8f23fc3 /system/libraries
parent04649d9dd5fbdf2d032eb3e4b969a4788d9451f0 (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
);
}