diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-21 20:00:07 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-21 20:00:07 +0200 |
| commit | b30f4fbdaa721101b7cc92f535bfe05b81e6b49c (patch) | |
| tree | ab0afbb48b5eaeb130e1eb4c61682b2f9d7ef50f /system/libraries/Cache/drivers/Cache_file.php | |
| parent | 92ff07ee199d17a4dccd84114da8b66a95a4f56d (diff) | |
| parent | 151b7a9abed49e76232ad195cc2c010bfc82f22a (diff) | |
Merge branch 'develop' into feature/unit-tests
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 ); } |