summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-01-21 14:04:31 +0100
committerAndrey Andreev <narf@bofh.bg>2013-01-21 14:04:31 +0100
commit7d2a3735170da12fb7f8455c6bab0c6ec2ec62ad (patch)
tree6d971ec4bf0a8186ff94e01ecac5830e36fe1746
parentb1d216ea969619befe2ddec9ffd6497465fcb333 (diff)
parent5dc6d51091b718d37d2c4b30da1e01b5b95333f8 (diff)
Merge pull request #2171 from purwandi/minify-table-block
Support minify table block in output
-rw-r--r--system/core/Output.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index e6c48b5dd..cf5178a0c 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -543,7 +543,7 @@ class CI_Output {
}
$expire = time() + ($this->cache_expiration * 60);
-
+
// Put together our serialized info.
$cache_info = serialize(array(
'expire' => $expire,
@@ -606,7 +606,7 @@ class CI_Output {
{
return FALSE;
}
-
+
$cache_info = unserialize($match[1]);
$expire = $cache_info['expire'];
@@ -625,7 +625,7 @@ class CI_Output {
// Or else send the HTTP cache control headers.
$this->set_cache_header($last_modified, $expire);
}
-
+
// Add headers from cache file.
foreach ($cache_info['headers'] as $header)
{
@@ -756,7 +756,7 @@ class CI_Output {
$output = preg_replace('{\s*<!--[^\[<>].*(?<!!)-->\s*}msU', '', $output);
// Remove spaces around block-level elements.
- $output = preg_replace('/\s*(<\/?(html|head|title|meta|script|link|style|body|h[1-6]|div|p|br)[^>]*>)\s*/is', '$1', $output);
+ $output = preg_replace('/\s*(<\/?(html|head|title|meta|script|link|style|body|table|thead|tbody|tfoot|tr|th|td|h[1-6]|div|p|br)[^>]*>)\s*/is', '$1', $output);
// Replace mangled <pre> etc. tags with unprocessed ones.