#102877: Don't let the css preprocessor mess up @import in some themes.

1 files changed, 3 insertions, 3 deletions

diff --git a/includes/common.inc b/includes/common.inc
index ff86ba85b..c2e5ca8d0 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1487,10 +1487,10 @@ function drupal_build_css_cache($types, $filename) {
           $contents = file_get_contents($file);
           // Return the path to where this CSS file originated from, stripping off the name of the file at the end of the path.
           $path = base_path() . substr($file, 0, strrpos($file, '/')) .'/';
+          // Wraps all @import arguments in url().
+          $contents = preg_replace('/@import\s+(?!url)[\'"]?(\S*)\b[\'"]?/i', '@import url("\1")', $contents);
           // Fix all paths within this CSS file, ignoring absolute paths.
-          $contents = preg_replace('/url\(([\'"]?)(?![a-z]+:)/i', 'url(\1'. $path . '\2', $contents);
-          // Fix any @import that don't use url() and is not absoslute.
-          $data .= preg_replace('/@import\s*([\'"]?)(?![a-z]+:)/i', '@import \1'. $path . '\2', $contents);
+          $data .= preg_replace('/url\(([\'"]?)(?![a-z]+:)/i', 'url(\1'. $path . '\2', $contents);
         }
       }
     }