summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrew Podner <a.podner@me.com>2012-12-26 03:46:05 +0100
committerAndrew Podner <a.podner@me.com>2012-12-26 03:46:05 +0100
commit58594ed44dfa39a4a1309b220a5420094dec23f7 (patch)
treeaa7cffb71fe69e4680e6e55e69f5ea8611676cf1 /system
parent464a7b79e6fe3d73c6ae9d82ba34f4f8effae684 (diff)
issue #2092 : Improve/Revise JS and CSS minify method
Diffstat (limited to 'system')
-rw-r--r--system/core/Output.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index f62885a72..4d89975a7 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -862,7 +862,7 @@ class CI_Output {
// or not preceded/followed by an alphanumeric
// or not preceded/followed \ $ and _
if ((preg_match('/^[\x20-\x7f]*$/D', $next) or preg_match('/^[\x20-\x7f]*$/D', $prev))
- && ( ! ctype_alnum($next) || ! ctype_alnum($prev))
+ && ( ! ctype_alnum($next) or ! ctype_alnum($prev))
&& ( ! in_array($next, array('\\', '_', '$')) && ! in_array($prev, array('\\', '_', '$'))))
{
unset($array_output[$key]);