diff options
author | Melounek <petr@heralecky.cz> | 2012-10-05 15:50:00 +0200 |
---|---|---|
committer | Melounek <petr@heralecky.cz> | 2012-10-05 15:50:00 +0200 |
commit | cc7c7c691ad16beb5040a8a1d07064e61b5e2167 (patch) | |
tree | f0ed98dc9f580bf38cfb13b72d8ab2cddfd69a3f /system/core/Output.php | |
parent | 58dfc089bf5b0ca35c2ff244e5bfdff726f9adcd (diff) | |
parent | 6123b61e8ec95ac91f67bfbf442e34021c922319 (diff) |
update devel version
Diffstat (limited to 'system/core/Output.php')
-rw-r--r-- | system/core/Output.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 5ec8c4bc0..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 = trim(str_replace('TS--->', '', $match[1])); + $expire = $match[1]; // Has the file expired? if ($_SERVER['REQUEST_TIME'] >= $expire && is_really_writable($cache_path)) @@ -575,7 +575,7 @@ class CI_Output { } // Display the cache - $this->_display(str_replace($match[0], '', $cache)); + $this->_display(substr($cache, strlen($match[0]))); log_message('debug', 'Cache file is current. Sending it to browser.'); return TRUE; } |