diff options
| author | dchill42 <dchill42@gmail.com> | 2012-07-31 15:41:01 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-07-31 15:41:01 +0200 |
| commit | 7e92b7332ea4d28648e69eabcb93cead35dbca26 (patch) | |
| tree | b7714536b89557129ed51fe675725fe28639c1e0 /system/core/Output.php | |
| parent | 57486009573a86d9e286a49c92216ba17aae0d5a (diff) | |
| parent | 3a2d573a96241c01124d15c1ce517078e07c6235 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into session
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..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)) @@ -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; } |