summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-23 17:15:54 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-23 17:15:54 +0200
commitf2fc944f74e9737de943858dc7aa1cccd99a470f (patch)
tree52ef4a94d285f03c26809197b0485e72c0aa5b36
parente3b5f8f6a0edcf5589cfb4b1a18991021922ef9e (diff)
parentd9384ad6472dd042a897a9b80d78bbf92a794c0f (diff)
Merge pull request #1648 from vlakoff/page-cache
output->_display_cache() simplifications
-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 2bf4e998f..9842f834d 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 = str_replace('TS--->', '', $match[0]);
// Has the file expired?
if ($_SERVER['REQUEST_TIME'] >= $expire && is_really_writable($cache_path))