diff options
| author | Ahmad Anbar <aanbar@gmail.com> | 2015-05-17 12:20:34 +0200 |
|---|---|---|
| committer | Ahmad Anbar <aanbar@gmail.com> | 2015-05-17 12:20:34 +0200 |
| commit | 57940dedcaab05f2dc392b2757cb3d58c59274c9 (patch) | |
| tree | 1783dc5a17cc20ddede409e13984576bff274302 /system/core/Output.php | |
| parent | 5e50c42ef27261bc7fcb279499ce76cfc2519aa6 (diff) | |
| parent | 3a9eb39f61b10b3f86e50f4cd39ca0d9f010bac2 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/core/Output.php')
| -rw-r--r-- | system/core/Output.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 02f66936c..e7d559a1d 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -674,7 +674,7 @@ class CI_Output { $cache_info = unserialize($match[1]); $expire = $cache_info['expire']; - $last_modified = filemtime($cache_path); + $last_modified = filemtime($filepath); // Has the file expired? if ($_SERVER['REQUEST_TIME'] >= $expire && is_really_writable($cache_path)) |