Commit 8f1ec56d authored by Dries's avatar Dries

- Patch #584370 by JoshuaRogers, JacobSingh | mattyoung: fixed bug with CSS...

- Patch #584370 by JoshuaRogers, JacobSingh | mattyoung: fixed bug with CSS file inclusion in the CSS optimization code.
parent dd7a450a
......@@ -3052,9 +3052,6 @@ function drupal_load_stylesheet($file, $optimize = NULL) {
* Contents of the stylesheet including the imported stylesheets.
*/
function drupal_load_stylesheet_content($contents, $optimize = FALSE) {
// Replaces @import commands with the actual stylesheet content.
// This happens recursively but omits external files.
$contents = preg_replace_callback('/@import\s*(?:url\()?[\'"]?(?![a-z]+:)([^\'"\()]+)[\'"]?\)?;/', '_drupal_load_stylesheet', $contents);
// Remove multiple charset declarations for standards compliance (and fixing Safari problems).
$contents = preg_replace('/^@charset\s+[\'"](\S*)\b[\'"];/i', '', $contents);
......@@ -3066,6 +3063,10 @@ function drupal_load_stylesheet_content($contents, $optimize = FALSE) {
[\n\r] # Remove line breaks.
>x', '\1', $contents);
}
// Replaces @import commands with the actual stylesheet content.
// This happens recursively but omits external files.
$contents = preg_replace_callback('/@import\s*(?:url\()?[\'"]?(?![a-z]+:)([^\'"\()]+)[\'"]?\)?;/', '_drupal_load_stylesheet', $contents);
return $contents;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment