summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrew Podner <a.podner@me.com>2012-12-26 14:05:44 +0100
committerAndrew Podner <a.podner@me.com>2012-12-26 14:05:44 +0100
commitae8c2d9d2644727bb347495a917bf437798596b4 (patch)
tree78a132510f10a845bb7d5586690310ccd71d08dc /system/core
parent58594ed44dfa39a4a1309b220a5420094dec23f7 (diff)
issue #2092 : Improve/Revise JS and CSS minify method (code refinements)
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Output.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 4d89975a7..769ec1915 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -861,8 +861,8 @@ class CI_Output {
// Strip spaces preceded/followed by a non-ASCII character
// 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) or ! ctype_alnum($prev))
+ if ((preg_match('/^[\x20-\x7f]*$/D', $next) OR preg_match('/^[\x20-\x7f]*$/D', $prev))
+ && ( ! ctype_alnum($next) OR ! ctype_alnum($prev))
&& ( ! in_array($next, array('\\', '_', '$')) && ! in_array($prev, array('\\', '_', '$'))))
{
unset($array_output[$key]);