Changeset 589 for trunk/lib

Timestamp:

Mar 18, 2017 12:34:38 PM (7 years ago)

Author:

anonymous

Message:

Updated the strip_whitespace regex to fix some errors found on the FWR admin site.

File:

• trunk/lib/JS.inc.php (modified) (2 diffs)

trunk/lib/JS.inc.php

@@ -182 +182 @@
                 // Strip whitespace and print file.
                 echo preg_replace(
-                    array('!^\s*//.*$!m', '!/\*.*?\*/!s', '/[\n\r]+/', '/[ \t]*}[ \t]*/', '/\s*{\s*/', '/\s*=\s*/', '/^\s+/m'),
-                    array('', '', "\n", '}', '{', '=', ''), file_get_contents($file, true)
+                    array('/(?<=^|;|{)\s*\/\/.*$/m', '/(?<=^|;|{)\s*\/\*.*?\*\//ms', '/[\n\r]+/', '/[ \t]+}[ \t]+/', '/[ \t]+{[ \t]+/', '/\s+=\s+/', '/^[ \t]+/m', '/[ \t]+$/m'),
+                    array('', '', "\n", '}', '{', '=', '', ''), file_get_contents($file, true)
                 );
             } else {
@@ -189 +189 @@
                 include $file;
             }
+            // Make sure there's at least one new-line between files.
+            echo "\n";
         }