From 8f1ec56d35004b188b176a85c89aee6db29cdc55 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 29 Sep 2009 17:52:46 +0000
Subject: [PATCH] - Patch #584370 by JoshuaRogers, JacobSingh | mattyoung:
fixed bug with CSS file inclusion in the CSS optimization code.
---
includes/common.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/includes/common.inc b/includes/common.inc
index 9a0d63310faf..ce37466c4344 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -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;
}
--
GitLab