Merge branch 'master' into stable

* master: (214 commits)
  release preparations
  postgresql auth plugin: correct function name
  parse AT parameter: first strtotime then timestamp remove config option
  move more strings to lang.php
  move strings to lang.php
  add placeholders for create page text
  phpdocs parserutils
  improve some scrutinizer issues
  visibility plugin methods
  use config cascade for loading of localizations
  reformatting config cascade
  add lang files to cascading
  work around missing gzopen on certain systems #865
  translation update
  fix scrutinizer issues
  fixed typos in docblock comments
  do not allow empty passwords
  clean user credentials from control chars
  added filter method to INPUT class
  translation update
  ...

1 files changed, 24 insertions, 7 deletions

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 30d0d18c5..6c1d60751 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -602,30 +602,47 @@ function css_comment_cb($matches){
 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);
+            $i = $len;
             break;
         }
+
+        // keep any quoted string that starts before a comment
+        $nextsqt = strpos($line, "'", $i);
+        $nextdqt = strpos($line, '"', $i);
+        if(min($nextsqt, $nextdqt) < $nextcom) {
+            $skipto = false;
+            if($nextsqt !== false && ($nextdqt === false || $nextsqt < $nextdqt)) {
+                $skipto = strpos($line, "'", $nextsqt+1) +1;
+            } else if ($nextdqt !== false) {
+                $skipto = strpos($line, '"', $nextdqt+1) +1;
+            }
+
+            if($skipto !== false) {
+                $i = $skipto;
+                continue;
+            }
+        }
+
         if($nexturl === false || $nextcom < $nexturl) {
             // no url anymore, strip comment and be done
-            $out .= substr($line, $i, $nextcom-$i);
+            $i = $nextcom;
             break;
         }
+
         // we have an upcoming url
-        $urlclose = strpos($line, ')', $nexturl);
-        $out .= substr($line, $i, $urlclose-$i);
-        $i = $urlclose;
+        $i = strpos($line, ')', $nexturl);
     }
 
-    return $out;
+    return substr($line, 0, $i);
 }
 
 //Setup VIM: ex: et ts=4 :