commit 4c81b72554f2dbac1159442965e7d0760b592e33
author Andrey Andreev <narf@bofh.bg> Mon Sep 17 03:07:34 2012 -0700
committer Andrey Andreev <narf@bofh.bg> Mon Sep 17 03:07:34 2012 -0700
tree 084144197bca37061ca6731370063a1b96f27f28
parent 4a853e206fe36126594d4ea3fd415db00264187d
parent 239e0e598f0b9462e195db5da658095eb70cf6e3

Merge pull request #1806 from vlakoff/develop-2

Better method for getting Output cache file embedded timestamp

system/core/Output.php

diff --git a/system/core/Output.php b/system/core/Output.php
index 9842f83..052367e 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -552,13 +552,13 @@
 		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))