diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-08-25 14:24:06 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-08-25 14:24:06 +0200 |
| commit | be72bd2d1cdba222bbbce547e1603de1e4ec7961 (patch) | |
| tree | 850711b8f4e981fcd1bf51151b1d71d53f630076 /system/libraries/Cache/drivers/Cache_file.php | |
| parent | 4bc4c1476344f96ebb920677f608cb185a48eaed (diff) | |
| parent | 9ff6336415f3da2a81142cb23343060df6196ebe (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Cache/drivers/Cache_file.php')
| -rw-r--r-- | system/libraries/Cache/drivers/Cache_file.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php index 13e2d1af6..6c37e7005 100644 --- a/system/libraries/Cache/drivers/Cache_file.php +++ b/system/libraries/Cache/drivers/Cache_file.php @@ -157,17 +157,16 @@ class CI_Cache_file extends CI_Driver { if (is_array($data)) { - $data = $data['data']; $mtime = filemtime($this->_cache_path.$id); - if ( ! isset($data['ttl'])) + if ( ! isset($data['data']['ttl'])) { return FALSE; } return array( - 'expire' => $mtime + $data['ttl'], - 'mtime' => $mtime + 'expire' => $mtime + $data['data']['ttl'], + 'mtime' => $mtime ); } |