summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-08-20 01:17:51 +0000
committerDries Buytaert <dries@buytaert.net>2010-08-20 01:17:51 +0000
commitf8952b675c8df8610e43f440bbfe48bd24dcc3cb (patch)
treee23d173745b5264b37b86e31c4e2339458971094
parent2cfca913e4589bcc0cd730fcb6e3ad1c220a68a4 (diff)
downloadbrdo-f8952b675c8df8610e43f440bbfe48bd24dcc3cb.tar.gz
brdo-f8952b675c8df8610e43f440bbfe48bd24dcc3cb.tar.bz2
- Patch #881132 by Garrett Albright: CSS Optimization breaks with non-UTF-8 .css files.
-rw-r--r--includes/common.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index fc5971dc0..959675f8b 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -3340,7 +3340,7 @@ function drupal_load_stylesheet_content($contents, $optimize = FALSE) {
// Regexp to match single quoted strings.
$single_quot = "'[^'\\\\]*(?:\\\\.[^'\\\\]*)*'";
$contents = preg_replace(
- "<($double_quot|$single_quot)|$comment>Sus", // Strip all comment blocks
+ "<($double_quot|$single_quot)|$comment>Ss", // Strip all comment blocks
"$1", // but keep double/single
$contents); // quoted strings.
$contents = preg_replace(