Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
diff --git a/system/core/Output.php b/system/core/Output.php
index ed294f1..4fdf18f 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -652,7 +652,7 @@
$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+}msU', '$1', $output);
+ $output = preg_replace('/\s*(<\/?(html|head|title|meta|script|link|style|body|h[1-6]|div|p|br)[^>]*>)\s*/is', '$1', $output);
// Replace mangled <pre> etc. tags with unprocessed ones.