summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorAlex Bilbie <alex@alexbilbie.com>2012-09-19 17:17:18 +0200
committerAlex Bilbie <alex@alexbilbie.com>2012-09-19 17:17:18 +0200
commita434f90f1fb15abc494b18126dc3563f12d2b9b3 (patch)
treea80f7fe213c708c7282f2fbe791a5d7861dd5d32 /system/core/Output.php
parent935d42f91a55a409ca02857ef1ef660c921ff1db (diff)
parentc2300c827f769ecde286419fcab29c4ec9698822 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Diffstat (limited to 'system/core/Output.php')
-rw-r--r--system/core/Output.php4
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))