2 files changed, 3 insertions, 3 deletions
diff --git a/lib/exe/css.php b/lib/exe/css.php
index f7235fd4e..9645b96bc 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -421,7 +421,7 @@ class DokuCssFile {
 
     protected $filepath;             // file system path to the CSS/Less file
     protected $location;             // base url location of the CSS/Less file
-    private   $relative_path = null;
+    protected $relative_path = null;
 
     public function __construct($file) {
         $this->filepath = $file;
@@ -454,7 +454,7 @@ class DokuCssFile {
      *
      * @return string   relative file system path
      */
-    private function getRelativePath(){
+    protected function getRelativePath(){
 
         if (is_null($this->relative_path)) {
             $basedir = array(DOKU_INC);
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");