summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLarsDW223 <lars_paulsen@web.de>2014-10-15 10:48:15 +0200
committerLarsDW223 <lars_paulsen@web.de>2014-10-15 10:48:15 +0200
commit5c5b52fd17bf855ab64656790b39ff43450902c9 (patch)
tree188a6114bfd9b5b64e58367b9be50ae474627c2d /lib
parent70daee86e69783928d3da887a3a3e26b8ab74734 (diff)
downloadrpg-5c5b52fd17bf855ab64656790b39ff43450902c9.tar.gz
rpg-5c5b52fd17bf855ab64656790b39ff43450902c9.tar.bz2
Fixed JavaScript compression. The compressor did not recognize a regular expression after a '&&' ot '||' operator. So it could happen that code had been cut off if the regular expression included '\//' (which was treated as a single line comment because of the regular expression not being recognized). Finally fixes #897.
Diffstat (limited to 'lib')
-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");