fix single line comments in CSS compression

double slashes in url() always have to be ignored

2 files changed, 66 insertions, 10 deletions

diff --git a/_test/tests/lib/exe/css_css_compress.test.php b/_test/tests/lib/exe/css_css_compress.test.php
index ba103813a..f0eb17968 100644
--- a/_test/tests/lib/exe/css_css_compress.test.php
+++ b/_test/tests/lib/exe/css_css_compress.test.php
@@ -10,33 +10,47 @@ class css_css_compress_test extends DokuWikiTest {
                   * line *test*
                   * check
                   */';
-        $this->assertEquals(css_compress($text), '');
+        $this->assertEquals('', css_compress($text));
     }
 
     function test_mlcom2(){
         $text = '#comment/* */ {
                     color: lime;
                 }';
-        $this->assertEquals(css_compress($text), '#comment/* */{color:lime;}');
+        $this->assertEquals('#comment/* */{color:lime;}', css_compress($text));
     }
 
     function test_slcom1(){
         $text = '// this is a comment';
-        $this->assertEquals(css_compress($text), '');
+        $this->assertEquals('', css_compress($text));
     }
 
     function test_slcom2(){
         $text = '#foo {
                     color: lime; // another comment
                 }';
-        $this->assertEquals(css_compress($text), '#foo{color:lime;}');
+        $this->assertEquals('#foo{color:lime;}', css_compress($text));
     }
 
     function test_slcom3(){
         $text = '#foo {
-                    background-image: url(http://foo.bar/baz.jpg);
+                    background-image: url(http://foo.bar/baz.jpg); // this is a comment
                 }';
-        $this->assertEquals(css_compress($text), '#foo{background-image:url(http://foo.bar/baz.jpg);}');
+        $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+    function test_slcom4(){
+        $text = '#foo {
+                    background-image: url(http://foo.bar/baz.jpg); background-image: url(http://foo.bar/baz.jpg); // this is a comment
+                }';
+        $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
+    }
+
+    function test_slcom5(){
+        $text = '#foo {
+                    background-image: url(http://foo.bar/baz.jpg); // background-image: url(http://foo.bar/baz.jpg); this is all commented
+                }';
+        $this->assertEquals('#foo{background-image:url(http://foo.bar/baz.jpg);}', css_compress($text));
     }
 
     function test_hack(){
@@ -44,7 +58,7 @@ class css_css_compress_test extends DokuWikiTest {
                  /* \\*/
                  display: inline; 
                  /* */';
-        $this->assertEquals(css_compress($text), '/* \\*/display:inline;/* */');
+        $this->assertEquals('/* \\*/display:inline;/* */', css_compress($text));
     }
 
     function test_hack2(){
@@ -54,12 +68,12 @@ class css_css_compress_test extends DokuWikiTest {
                      height: 450px;
                  }
                  /**/';
-        $this->assertEquals(css_compress($text), '/*\\*/* html .page{height:450px;}/**/');
+        $this->assertEquals('/*\\*/* html .page{height:450px;}/**/', css_compress($text));
     }
 
     function test_nl1(){
         $text = "a{left:20px;\ntop:20px}";
-        $this->assertEquals(css_compress($text), 'a{left:20px;top:20px}');
+        $this->assertEquals('a{left:20px;top:20px}', css_compress($text));
     }
 
     function test_shortening() {
diff --git a/lib/exe/css.php b/lib/exe/css.php
index cab7384b2..0a2a5a406 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -552,7 +552,7 @@ function css_compress($css){
     $css = preg_replace_callback('#(/\*)(.*?)(\*/)#s','css_comment_cb',$css);
 
     //strip (incorrect but common) one line comments
-    $css = preg_replace('/(?<!:)\/\/.*$/m','',$css);
+    $css = preg_replace_callback('/^.*\/\/.*$/m','css_onelinecomment_cb',$css);
 
     // strip whitespaces
     $css = preg_replace('![\r\n\t ]+!',' ',$css);
@@ -588,4 +588,46 @@ function css_comment_cb($matches){
     return $matches[0];
 }
 
+/**
+ * Callback for css_compress()
+ *
+ * Strips one line comments but makes sure it will not destroy url() constructs with slashes
+ *
+ * @param $matches
+ * @return string
+ */
+function css_onelinecomment_cb($matches) {
+    $line = $matches[0];
+
+    $out = '';
+    $i = 0;
+    $len = strlen($line);
+    while ($i< $len){
+        $nextcom = strpos($line, '//', $i);
+        $nexturl = stripos($line, 'url(', $i);
+
+        if($nextcom === false) {
+            // no more comments, we're done
+            $out .= substr($line, $i, $len-$i);
+            break;
+        }
+        if($nexturl === false) {
+            // no url anymore, strip comment and be done
+            $out .= substr($line, $i, $nextcom-$i);
+            break;
+        }
+        if($nextcom < $nexturl) {
+            // that comment comments out the url
+            $out .= substr($line, $i, $len-$i);
+            break;
+        }
+        // we have an upcoming url
+        $urlclose = strpos($line, ')', $nexturl);
+        $out .= substr($line, $i, $urlclose-$i);
+        $i = $urlclose;
+    }
+
+    return $out;
+}
+
 //Setup VIM: ex: et ts=4 :