? 113603_styleinherit.patch
? files
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.340
diff -u -p -r1.340 theme.inc
--- includes/theme.inc	31 Jan 2007 15:49:22 -0000	1.340
+++ includes/theme.inc	6 Feb 2007 03:36:53 -0000
@@ -56,14 +56,23 @@ function init_theme() {
   // Also add the stylesheet using drupal_add_css().
   // Otherwise, load the theme.
   if (strpos($themes[$theme]->filename, '.css')) {
+
+    // If this is a subtheme, make the assumption that the parent theme's
+    // style.css is being overwritten. Subthemes can't include the parent
+    // style.css via @import because of the CSS processor (#113607, #113829).
+    // we'll force a parent style.css include if we detect this scenario.
+    if (file_exists($stylesheet = dirname($themes[$theme]->description) .'/style.css')) {
+      drupal_add_css($stylesheet, 'theme');
+    }
+
     // File is a style; loads its CSS.
-    // Set theme to its template/theme
+    // Set theme to its template/theme.
     drupal_add_css($themes[$theme]->filename, 'theme');
     $theme = basename(dirname($themes[$theme]->description));
   }
   else {
-    // File is a template/theme
-    // Load its CSS, if it exists
+    // File is a template/theme.
+    // Load its CSS, if it exists.
     if (file_exists($stylesheet = dirname($themes[$theme]->filename) .'/style.css')) {
       drupal_add_css($stylesheet, 'theme');
     }
Index: themes/garland/minnelli/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/minnelli/style.css,v
retrieving revision 1.3
diff -u -p -r1.3 style.css
--- themes/garland/minnelli/style.css	4 Jan 2007 03:27:07 -0000	1.3
+++ themes/garland/minnelli/style.css	6 Feb 2007 03:36:53 -0000
@@ -4,8 +4,6 @@
  * Steven Wittens, acko [dot] net
  */
 
-@import "../style.css";
-
 body #wrapper #container {
   width: 560px;
 }