diff options
| author | Bruno Barão <brunobarao@gmail.com> | 2012-10-08 17:21:36 +0200 |
|---|---|---|
| committer | Bruno Barão <brunobarao@gmail.com> | 2012-10-08 17:21:36 +0200 |
| commit | 02561acf13f19881f4e3f95cf2fb423665d5ce8b (patch) | |
| tree | fb88af9da77e37447d9e1513146aad870e65ea5d /system/core/Output.php | |
| parent | b453e16668c70b0eb02b5ae69cd3196d735421f8 (diff) | |
| parent | 960e616d18c77f463e7c53f666d98b09f5ca9057 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/core/Output.php')
| -rw-r--r-- | system/core/Output.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 9842f834d..052367ed6 100644 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -552,13 +552,13 @@ class CI_Output { fclose($fp); // Strip out the embedded timestamp - if ( ! preg_match('/\d+TS--->/', $cache, $match)) + if ( ! preg_match('/^(\d+)TS--->/', $cache, $match)) { return FALSE; } $last_modified = filemtime($cache_path); - $expire = str_replace('TS--->', '', $match[0]); + $expire = $match[1]; // Has the file expired? if ($_SERVER['REQUEST_TIME'] >= $expire && is_really_writable($cache_path)) |