Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.1146 diff -u -p -r1.1146 common.inc --- includes/common.inc 11 Apr 2010 18:33:43 -0000 1.1146 +++ includes/common.inc 17 Apr 2010 17:42:14 -0000 @@ -2669,7 +2669,7 @@ function drupal_add_css($data = NULL, $o 'type' => 'file', 'weight' => CSS_DEFAULT, 'media' => 'all', - 'preprocess' => TRUE, + 'preprocess' => FALSE, 'data' => $data, 'browsers' => array(), ); @@ -3601,7 +3601,7 @@ function drupal_js_defaults($data = NULL 'scope' => 'header', 'cache' => TRUE, 'defer' => FALSE, - 'preprocess' => TRUE, + 'preprocess' => FALSE, 'version' => NULL, 'data' => $data, ); Index: includes/locale.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/locale.inc,v retrieving revision 1.251 diff -u -p -r1.251 locale.inc --- includes/locale.inc 9 Apr 2010 12:14:25 -0000 1.251 +++ includes/locale.inc 17 Apr 2010 17:42:14 -0000 @@ -1777,7 +1777,7 @@ function _locale_rebuild_js($langcode = */ function _locale_translate_language_list($translation, $limit_language) { // Add CSS. - drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css'); $languages = language_list(); unset($languages['en']); Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.76 diff -u -p -r1.76 block.admin.inc --- modules/block/block.admin.inc 28 Mar 2010 11:16:29 -0000 1.76 +++ modules/block/block.admin.inc 17 Apr 2010 17:42:14 -0000 @@ -10,7 +10,7 @@ * Menu callback for admin/structure/block/demo. */ function block_admin_demo($theme = NULL) { - drupal_add_css(drupal_get_path('module', 'block') . '/block.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'block') . '/block.css'); return ''; } @@ -45,7 +45,7 @@ function block_admin_display($theme = NU */ function block_admin_display_form($form, &$form_state, $blocks, $theme) { - drupal_add_css(drupal_get_path('module', 'block') . '/block.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'block') . '/block.css'); $block_regions = system_region_list($theme, REGIONS_VISIBLE) + array(BLOCK_REGION_NONE => '<' . t('none') . '>'); Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.83 diff -u -p -r1.83 color.module --- modules/color/color.module 13 Apr 2010 15:23:02 -0000 1.83 +++ modules/color/color.module 17 Apr 2010 17:42:14 -0000 @@ -182,7 +182,7 @@ function color_scheme_form($complete_for ), // Add custom CSS. 'css' => array( - $base . '/color.css' => array('preprocess' => FALSE), + $base . '/color.css' => array(), ), // Add custom JavaScript. 'js' => array( Index: modules/dblog/dblog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v retrieving revision 1.52 diff -u -p -r1.52 dblog.module --- modules/dblog/dblog.module 27 Mar 2010 14:24:14 -0000 1.52 +++ modules/dblog/dblog.module 17 Apr 2010 17:42:14 -0000 @@ -79,7 +79,7 @@ function dblog_menu() { function dblog_init() { if (arg(0) == 'admin' && arg(1) == 'reports') { // Add the CSS for this module - drupal_add_css(drupal_get_path('module', 'dblog') . '/dblog.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'dblog') . '/dblog.css'); } } Index: modules/help/help.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.admin.inc,v retrieving revision 1.11 diff -u -p -r1.11 help.admin.inc --- modules/help/help.admin.inc 13 Oct 2009 05:26:57 -0000 1.11 +++ modules/help/help.admin.inc 17 Apr 2010 17:42:14 -0000 @@ -11,7 +11,7 @@ */ function help_main() { // Add CSS - drupal_add_css(drupal_get_path('module', 'help') . '/help.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'help') . '/help.css'); $output = '

' . t('Help topics') . '

' . t('Help is available on the following items:') . '

' . help_links_as_list(); return $output; } Index: modules/image/image.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.admin.inc,v retrieving revision 1.18 diff -u -p -r1.18 image.admin.inc --- modules/image/image.admin.inc 13 Apr 2010 15:23:03 -0000 1.18 +++ modules/image/image.admin.inc 17 Apr 2010 17:42:14 -0000 @@ -16,7 +16,7 @@ function image_style_list() { $page['image_style_list'] = array( '#markup' => theme('image_style_list', array('styles' => $styles)), '#attached' => array( - 'css' => array(drupal_get_path('module', 'image') . '/image.admin.css' => array('preprocess' => FALSE)), + 'css' => array(drupal_get_path('module', 'image') . '/image.admin.css' => array()), ), ); @@ -48,7 +48,7 @@ function image_style_form($form, &$form_ $form_state['image_style'] = $style; $form['#tree'] = TRUE; - $form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array('preprocess' => FALSE); + $form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array(); // Show the thumbnail preview. $form['preview'] = array( @@ -377,7 +377,7 @@ function image_effect_form($form, &$form } $form['#tree'] = TRUE; - $form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array('preprocess' => FALSE); + $form['#attached']['css'][drupal_get_path('module', 'image') . '/image.admin.css'] = array(); if (function_exists($effect['form callback'])) { $form['data'] = call_user_func($effect['form callback'], $effect['data']); } Index: modules/locale/locale.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.admin.inc,v retrieving revision 1.11 diff -u -p -r1.11 locale.admin.inc --- modules/locale/locale.admin.inc 13 Apr 2010 15:23:03 -0000 1.11 +++ modules/locale/locale.admin.inc 17 Apr 2010 17:42:14 -0000 @@ -782,7 +782,7 @@ function locale_translate_overview_scree */ function locale_translate_seek_screen() { // Add CSS. - drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'locale') . '/locale.css'); $elements = drupal_get_form('locale_translation_filter_form'); $output = drupal_render($elements); Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.344 diff -u -p -r1.344 search.module --- modules/search/search.module 11 Apr 2010 18:54:11 -0000 1.344 +++ modules/search/search.module 17 Apr 2010 17:42:14 -0000 @@ -890,7 +890,7 @@ function search_get_keys() { */ function search_form($form, &$form_state, $action = '', $keys = '', $type = NULL, $prompt = NULL) { // Add CSS - drupal_add_css(drupal_get_path('module', 'search') . '/search.css', array('preprocess' => FALSE)); + drupal_add_css(drupal_get_path('module', 'search') . '/search.css'); if (!$action) { $action = 'search/' . $type; Index: modules/simpletest/tests/common.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v retrieving revision 1.109 diff -u -p -r1.109 common.test --- modules/simpletest/tests/common.test 11 Apr 2010 18:33:44 -0000 1.109 +++ modules/simpletest/tests/common.test 17 Apr 2010 17:42:14 -0000 @@ -576,7 +576,7 @@ class CascadingStylesheetsTestCase exten function testRenderInlinePreprocess() { $css = 'body { padding: 0px; }'; $css_preprocessed = ''; - drupal_add_css($css, 'inline'); + drupal_add_css($css, 'inline', 'preprocess' => TRUE); $styles = drupal_get_css(); $this->assertEqual(trim($styles), $css_preprocessed, t('Rendering preprocessed inline CSS adds it to the page.')); } @@ -586,7 +586,7 @@ class CascadingStylesheetsTestCase exten */ function testRenderInlineNoPreprocess() { $css = 'body { padding: 0px; }'; - drupal_add_css($css, array('type' => 'inline', 'preprocess' => FALSE)); + drupal_add_css($css, array('type' => 'inline')); $styles = drupal_get_css(); $this->assertTrue(strpos($styles, $css) > 0, t('Rendering non-preprocessed inline CSS adds it to the page.')); } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.921 diff -u -p -r1.921 system.module --- modules/system/system.module 13 Apr 2010 15:23:03 -0000 1.921 +++ modules/system/system.module 17 Apr 2010 17:42:15 -0000 @@ -1115,7 +1115,7 @@ function system_library() { 'misc/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'misc/farbtastic/farbtastic.css' => array('preprocess' => FALSE), + 'misc/farbtastic/farbtastic.css' => array(), ), ); Index: modules/tracker/tracker.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v retrieving revision 1.31 diff -u -p -r1.31 tracker.pages.inc --- modules/tracker/tracker.pages.inc 14 Jan 2010 06:23:40 -0000 1.31 +++ modules/tracker/tracker.pages.inc 17 Apr 2010 17:42:15 -0000 @@ -113,7 +113,7 @@ function tracker_page($account = NULL, $ '#theme' => 'table', '#empty' => t('No content available.'), '#attached' => array( - 'css' => array(drupal_get_path('module', 'tracker') . '/tracker.css' => array('preprocess' => FALSE)), + 'css' => array(drupal_get_path('module', 'tracker') . '/tracker.css' => array()), ), ); $page['pager'] = array( Index: themes/garland/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.39 diff -u -p -r1.39 template.php --- themes/garland/template.php 4 Mar 2010 09:03:08 -0000 1.39 +++ themes/garland/template.php 17 Apr 2010 17:42:15 -0000 @@ -42,7 +42,7 @@ function garland_preprocess_html(&$vars) $vars['classes_array'][] = 'fluid-width'; } // Add conditional CSS for IE6. - drupal_add_css(path_to_theme() . '/fix-ie.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); + drupal_add_css(path_to_theme() . '/fix-ie.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE))); } /** Index: themes/seven/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/template.php,v retrieving revision 1.15 diff -u -p -r1.15 template.php --- themes/seven/template.php 24 Mar 2010 09:26:37 -0000 1.15 +++ themes/seven/template.php 17 Apr 2010 17:42:15 -0000 @@ -6,9 +6,9 @@ */ function seven_preprocess_html(&$vars) { // Add conditional CSS for IE8 and below. - drupal_add_css(path_to_theme() . '/ie.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'preprocess' => FALSE)); + drupal_add_css(path_to_theme() . '/ie.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE))); // Add conditional CSS for IE6. - drupal_add_css(path_to_theme() . '/ie6.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); + drupal_add_css(path_to_theme() . '/ie6.css', array('weight' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE))); } /**