diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/includes/common.inc b/includes/common.inc index 3c6d28423..bab8b1e82 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3463,13 +3463,34 @@ function drupal_load_stylesheet_content($contents, $optimize = FALSE) { $double_quot = '"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"'; // Regexp to match single quoted strings. $single_quot = "'[^'\\\\]*(?:\\\\.[^'\\\\]*)*'"; + // Strip all comment blocks, but keep double/single quoted strings. $contents = preg_replace( - "<($double_quot|$single_quot)|$comment>Ss", // Strip all comment blocks - "$1", // but keep double/single - $contents); // quoted strings. - $contents = preg_replace( - '<\s*([@{}:;,]|\)\s|\s\()\s*>S', // Remove whitespace around separators, - '\1', $contents); // but keep space around parentheses. + "<($double_quot|$single_quot)|$comment>Ss", + "$1", + $contents + ); + // Remove certain whitespace. + // There are different conditions for removing leading and trailing + // whitespace. To be able to use a single backreference in the replacement + // string, the outer pattern uses the ?| modifier, which makes all contained + // subpatterns appear in \1. + // @see http://php.net/manual/en/regexp.reference.subpatterns.php + $contents = preg_replace('< + (?| + # Strip leading and trailing whitespace. + \s*([@{};,])\s* + # Strip only leading whitespace from: + # - Closing parenthesis: Retain "@media (bar) and foo". + | \s+([\)]) + # Strip only trailing whitespace from: + # - Opening parenthesis: Retain "@media (bar) and foo". + # - Colon: Retain :pseudo-selectors. + | ([\(:])\s+ + ) + >xS', + '\1', + $contents + ); // End the file with a new line. $contents .= "\n"; } |