summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-04-10 10:19:01 +0000
committerDries Buytaert <dries@buytaert.net>2008-04-10 10:19:01 +0000
commitee08784f880fb214d882da6338fdc7c9b6c797c3 (patch)
tree665bece307b729db016c6eff392e37225f1ef653
parent23602afbe1d8861e88142df2490054689f562349 (diff)
downloadbrdo-ee08784f880fb214d882da6338fdc7c9b6c797c3.tar.gz
brdo-ee08784f880fb214d882da6338fdc7c9b6c797c3.tar.bz2
- Patch #189568 by dvessel: don't include a CSS file in the aggregated CSS output when that file is overwritten by a theme-specific CSS file.
-rw-r--r--includes/common.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/includes/common.inc b/includes/common.inc
index a77479e1f..721091bad 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1705,6 +1705,8 @@ function drupal_get_css($css = NULL) {
// If the theme supplies its own style using the name of the module style, skip its inclusion.
// This includes any RTL styles associated with its main LTR counterpart.
if ($type == 'module' && in_array(str_replace('-rtl.css', '.css', basename($file)), $theme_styles)) {
+ // Unset the file to prevent its inclusion when CSS aggregation is enabled.
+ unset($types[$type][$file]);
continue;
}
if (!$preprocess || !($is_writable && $preprocess_css)) {