### Eclipse Workspace Patch 1.0
#P drupal-6
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.756.2.10
diff -u -r1.756.2.10 common.inc
--- includes/common.inc 9 Apr 2008 23:28:56 -0000 1.756.2.10
+++ includes/common.inc 5 May 2008 21:50:07 -0000
@@ -1718,15 +1718,15 @@
// If a CSS file is not to be preprocessed and it's a module CSS file, it needs to *always* appear at the *top*,
// regardless of whether preprocessing is on or off.
if (!$preprocess && $type == 'module') {
- $no_module_preprocess .= ''."\n";
+ $no_module_preprocess .= '@import url("'. base_path() . $file . $query_string .'") '. $media .";\n";
}
// If a CSS file is not to be preprocessed and it's a theme CSS file, it needs to *always* appear at the *bottom*,
// regardless of whether preprocessing is on or off.
else if (!$preprocess && $type == 'theme') {
- $no_theme_preprocess .= ''."\n";
+ $no_theme_preprocess .= '@import url("'. base_path() . $file . $query_string .'") '. $media .";\n";
}
else {
- $output .= ''."\n";
+ $output .= '@import url("'. base_path() . $file . $query_string .'") '. $media .";\n";
}
}
}
@@ -1735,11 +1735,11 @@
if ($is_writable && $preprocess_css) {
$filename = md5(serialize($types) . $query_string) .'.css';
$preprocess_file = drupal_build_css_cache($types, $filename);
- $output .= ''."\n";
+ $output .= '@import url("'. base_path() . $preprocess_file .'") '. $media .";\n";
}
}
- return $no_module_preprocess . $output . $no_theme_preprocess;
+ return '' . "\n";
}
/**