summaryrefslogtreecommitdiff
path: root/lib/exe
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2014-10-17 14:23:09 +0200
committerAndreas Gohr <andi@splitbrain.org>2014-10-17 14:23:09 +0200
commitfa3d5aa058cc768bc6716e2559d65d13f045c861 (patch)
tree6bf87b9062d55a1bd3955805e51cd0d7ba20b8a3 /lib/exe
parent3259a835bc6b5a3eae5f523bf04f2b08de0d9dad (diff)
parent6275d9067f8a0a7216fece2d49ba2064967bc194 (diff)
downloadrpg-fa3d5aa058cc768bc6716e2559d65d13f045c861.tar.gz
rpg-fa3d5aa058cc768bc6716e2559d65d13f045c861.tar.bz2
Merge pull request #903 from LarsGit223/master
Fixed unrecognized regular expressions behind '&&' or '||' operators in JavaScript compression. Finally fixes #897.
Diffstat (limited to 'lib/exe')
-rw-r--r--lib/exe/js.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 2ab78dfc3..545ba7b23 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -293,7 +293,7 @@ function js_compress($s){
// E.g. '+ ++' may not be compressed to '+++' --> syntax error.
$ops = "+-";
- $regex_starters = array("(", "=", "[", "," , ":", "!");
+ $regex_starters = array("(", "=", "[", "," , ":", "!", "&", "|");
$whitespaces_chars = array(" ", "\t", "\n", "\r", "\0", "\x0B");