diff options
| author | David Rothstein <drothstein@gmail.com> | 2015-05-04 18:59:58 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2015-05-04 18:59:58 -0400 |
| commit | 00e7efc01bcd6d5698bc2faabc1003bc5dd999b4 (patch) | |
| tree | d5d7306f287571ad37a92cde319711f13dc32ae0 /includes | |
| parent | 39762b7135c10cd392061cafba504c2e7d8e2a3d (diff) | |
| download | brdo-00e7efc01bcd6d5698bc2faabc1003bc5dd999b4.tar.gz brdo-00e7efc01bcd6d5698bc2faabc1003bc5dd999b4.tar.bz2 | |
Issue #2014851 by hlieberman, Wim Leers, bradjones1, markcarver: Drupal CSS preprocessing breaks protocol-relative paths
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc index 0437ec1a4..a80792e32 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3802,7 +3802,7 @@ 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\(\s*)?[\'"]?(?![a-z]+:)([^\'"\()]+)[\'"]?\s*\)?\s*;/', '_drupal_load_stylesheet', $contents); + $contents = preg_replace_callback('/@import\s*(?:url\(\s*)?[\'"]?(?![a-z]+:)(?!\/\/)([^\'"\()]+)[\'"]?\s*\)?\s*;/', '_drupal_load_stylesheet', $contents); return $contents; } |