Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.1146 diff -u -r1.1146 common.inc --- includes/common.inc 11 Apr 2010 18:33:43 -0000 1.1146 +++ includes/common.inc 23 Apr 2010 05:18:24 -0000 @@ -2669,7 +2669,7 @@ 'type' => 'file', 'weight' => CSS_DEFAULT, 'media' => 'all', - 'preprocess' => TRUE, + 'preprocess' => FALSE, 'data' => $data, 'browsers' => array(), ); @@ -3601,7 +3601,7 @@ '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 -r1.251 locale.inc --- includes/locale.inc 9 Apr 2010 12:14:25 -0000 1.251 +++ includes/locale.inc 23 Apr 2010 05:18:24 -0000 @@ -1777,7 +1777,7 @@ */ 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/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.438 diff -u -r1.438 aggregator.module --- modules/aggregator/aggregator.module 13 Apr 2010 15:23:02 -0000 1.438 +++ modules/aggregator/aggregator.module 23 Apr 2010 05:18:24 -0000 @@ -286,7 +286,7 @@ * Implements hook_init(). */ function aggregator_init() { - drupal_add_css(drupal_get_path('module', 'aggregator') . '/aggregator.css'); + drupal_add_css(drupal_get_path('module', 'aggregator') . '/aggregator.css', array('preprocess' => TRUE)); } /** Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.76 diff -u -r1.76 block.admin.inc --- modules/block/block.admin.inc 28 Mar 2010 11:16:29 -0000 1.76 +++ modules/block/block.admin.inc 23 Apr 2010 05:18:24 -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_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/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.539 diff -u -r1.539 book.module --- modules/book/book.module 13 Apr 2010 15:23:02 -0000 1.539 +++ modules/book/book.module 23 Apr 2010 05:18:24 -0000 @@ -229,7 +229,8 @@ * Implements hook_init(). */ function book_init() { - drupal_add_css(drupal_get_path('module', 'book') . '/book.css'); + drupal_add_css(drupal_get_path('module', 'book') . '/book.css', array('preprocess' => TRUE)); + drupal_add_js(drupal_get_path('module', 'book') . '/book.js', array('preprocess' => TRUE)); } /** @@ -489,9 +490,6 @@ '#collapsible' => TRUE, '#collapsed' => TRUE, '#group' => 'additional_settings', - '#attached' => array( - 'js' => array(drupal_get_path('module', 'book') . '/book.js'), - ), '#tree' => TRUE, '#attributes' => array('class' => array('book-outline-form')), ); Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.83 diff -u -r1.83 color.module --- modules/color/color.module 13 Apr 2010 15:23:02 -0000 1.83 +++ modules/color/color.module 23 Apr 2010 05:18:24 -0000 @@ -182,7 +182,7 @@ ), // Add custom CSS. 'css' => array( - $base . '/color.css' => array('preprocess' => FALSE), + $base . '/color.css' => array(), ), // Add custom JavaScript. 'js' => array( Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.867 diff -u -r1.867 comment.module --- modules/comment/comment.module 16 Apr 2010 13:56:45 -0000 1.867 +++ modules/comment/comment.module 23 Apr 2010 05:18:24 -0000 @@ -287,6 +287,14 @@ } /** + * Implements hook_init(). + */ +function comment_init() { + drupal_add_css(drupal_get_path('module', 'comment') . '/comment.css', array('preprocess' => TRUE)); + drupal_add_js(drupal_get_path('module', 'comment') . '/comment.js', array('preprocess' => TRUE)); +} + +/** * Implements hook_menu_alter(). */ function comment_menu_alter(&$items) { @@ -709,7 +717,6 @@ $comments = comment_load_multiple($cids); comment_prepare_thread($comments); $build = comment_view_multiple($comments, $node); - $build['#attached']['css'][] = drupal_get_path('module', 'comment') . '/comment.css'; $build['pager']['#theme'] = 'pager'; $additions['comments'] = $build; } @@ -1070,9 +1077,6 @@ '#collapsible' => TRUE, '#collapsed' => TRUE, '#group' => 'additional_settings', - '#attached' => array( - 'js' => array(drupal_get_path('module', 'comment') . '/comment-node-form.js'), - ), ); $form['comment']['comment_default_mode'] = array( '#type' => 'checkbox', @@ -1143,9 +1147,6 @@ '#collapsible' => TRUE, '#collapsed' => TRUE, '#group' => 'additional_settings', - '#attached' => array( - 'js' => array(drupal_get_path('module', 'comment') . '/comment-node-form.js'), - ), '#weight' => 30, ); $comment_count = isset($node->nid) ? db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array(':nid' => $node->nid))->fetchField() : 0; Index: modules/dblog/dblog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/dblog/dblog.module,v retrieving revision 1.52 diff -u -r1.52 dblog.module --- modules/dblog/dblog.module 27 Mar 2010 14:24:14 -0000 1.52 +++ modules/dblog/dblog.module 23 Apr 2010 05:18:24 -0000 @@ -79,7 +79,7 @@ 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/field/field.attach.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.attach.inc,v retrieving revision 1.86 diff -u -r1.86 field.attach.inc --- modules/field/field.attach.inc 4 Apr 2010 12:48:18 -0000 1.86 +++ modules/field/field.attach.inc 23 Apr 2010 05:18:24 -0000 @@ -551,7 +551,6 @@ // Add custom weight handling. list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity); - $form['#attached']['css'][] = drupal_get_path('module', 'field') . '/theme/field.css'; $form['#pre_render'][] = '_field_extra_weights_pre_render'; $form['#extra_fields'] = field_extra_fields($entity_type, $bundle); @@ -1262,9 +1261,6 @@ $output['#pre_render'][] = '_field_extra_weights_pre_render'; $output['#extra_fields'] = field_extra_fields($entity_type, $bundle); - // Include CSS styles. - $output['#attached']['css'][] = drupal_get_path('module', 'field') . '/theme/field.css'; - // Let other modules alter the renderable array. $context = array( 'entity_type' => $entity_type, Index: modules/field/field.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/field.module,v retrieving revision 1.72 diff -u -r1.72 field.module --- modules/field/field.module 13 Apr 2010 15:23:02 -0000 1.72 +++ modules/field/field.module 23 Apr 2010 05:18:24 -0000 @@ -188,6 +188,13 @@ } /** + * Implements hook_init(). + */ +function field_init() { + drupal_add_css(drupal_get_path('module', 'field') . '/theme/field.css', array('preprocess' => TRUE)); +} + +/** * Implements hook_cron(). * * Purges some deleted Field API data, if any exists. @@ -616,7 +623,6 @@ if (isset($result[$field_name])) { $output = $result[$field_name]; - $output['#attached']['css'][] = drupal_get_path('module', 'field') . '/theme/field.css'; } } Index: modules/field/modules/text/text.module =================================================================== RCS file: /cvs/drupal/drupal/modules/field/modules/text/text.module,v retrieving revision 1.53 diff -u -r1.53 text.module --- modules/field/modules/text/text.module 13 Apr 2010 15:16:27 -0000 1.53 +++ modules/field/modules/text/text.module 23 Apr 2010 05:18:24 -0000 @@ -20,6 +20,13 @@ } /** + * Implements hook_init(). + */ +function text_init() { + drupal_add_js(drupal_get_path('module', 'text') . '/text.js', array('preprocess' => TRUE)); +} + +/** * Implements hook_field_info(). * * Field settings: @@ -534,9 +541,6 @@ '#title' => t('Summary'), '#rows' => $instance['widget']['settings']['summary_rows'], '#description' => t('Leave blank to use trimmed value of full text as the summary.'), - '#attached' => array( - 'js' => array(drupal_get_path('module', 'text') . '/text.js'), - ), '#attributes' => array('class' => array('text-summary')), '#prefix' => '
', '#suffix' => '
', Index: modules/file/file.module =================================================================== RCS file: /cvs/drupal/drupal/modules/file/file.module,v retrieving revision 1.25 diff -u -r1.25 file.module --- modules/file/file.module 13 Apr 2010 15:23:03 -0000 1.25 +++ modules/file/file.module 23 Apr 2010 05:18:24 -0000 @@ -54,6 +54,13 @@ } /** + * Implements hook_init(). + */ +function file_init() { + drupal_add_css(drupal_get_path('module', 'file') . '/file.css', array('preprocess' => TRUE)); +} + +/** * Implements hook_element_info(). * * The managed file element may be used independently anywhere in Drupal. @@ -73,7 +80,6 @@ '#upload_location' => NULL, '#extended' => FALSE, '#attached' => array( - 'css' => array($file_path . '/file.css'), 'js' => array($file_path . '/file.js'), ), ); Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.327 diff -u -r1.327 filter.module --- modules/filter/filter.module 13 Apr 2010 15:23:03 -0000 1.327 +++ modules/filter/filter.module 23 Apr 2010 05:18:25 -0000 @@ -336,6 +336,15 @@ } /** + * Implements hook_init(). + */ +function filter_init() { + $path = drupal_get_path('module', 'filter'); + drupal_add_css($path . '/filter.css', array('preprocess' => TRUE)); + drupal_add_js($path . '/filter.js', array('preprocess' => TRUE)); +} + +/** * Implements hook_modules_enabled(). */ function filter_modules_enabled($modules) { @@ -797,11 +806,6 @@ $element['value']['#type'] = $element['#base_type']; $element['value'] += element_info($element['#base_type']); - // Turn original element into a text format wrapper. - $path = drupal_get_path('module', 'filter'); - $element['#attached']['js'][] = $path . '/filter.js'; - $element['#attached']['css'][] = $path . '/filter.css'; - // Apply default #after_build behavior. $element['#after_build'][] = 'filter_form_after_build'; Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.563 diff -u -r1.563 forum.module --- modules/forum/forum.module 14 Apr 2010 15:51:21 -0000 1.563 +++ modules/forum/forum.module 23 Apr 2010 05:18:25 -0000 @@ -215,7 +215,7 @@ * Implements hook_init(). */ function forum_init() { - drupal_add_css(drupal_get_path('module', 'forum') . '/forum.css'); + drupal_add_css(drupal_get_path('module', 'forum') . '/forum.css', array('preprocess' => TRUE)); } /** Index: modules/help/help.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.admin.inc,v retrieving revision 1.11 diff -u -r1.11 help.admin.inc --- modules/help/help.admin.inc 13 Oct 2009 05:26:57 -0000 1.11 +++ modules/help/help.admin.inc 23 Apr 2010 05:18:25 -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 -r1.18 image.admin.inc --- modules/image/image.admin.inc 13 Apr 2010 15:23:03 -0000 1.18 +++ modules/image/image.admin.inc 23 Apr 2010 05:18:25 -0000 @@ -16,7 +16,7 @@ $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 @@ $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 @@ } $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/image/image.field.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.field.inc,v retrieving revision 1.20 diff -u -r1.20 image.field.inc --- modules/image/image.field.inc 13 Apr 2010 15:23:03 -0000 1.20 +++ modules/image/image.field.inc 23 Apr 2010 05:18:25 -0000 @@ -356,7 +356,6 @@ $widget_settings = $instance['widget']['settings']; $element['#theme'] = 'image_widget'; - $element['#attached']['css'][] = drupal_get_path('module', 'image') . '/image.css'; // Add the image preview. if ($element['#file'] && $widget_settings['preview_image_style']) { Index: modules/image/image.module =================================================================== RCS file: /cvs/drupal/drupal/modules/image/image.module,v retrieving revision 1.36 diff -u -r1.36 image.module --- modules/image/image.module 13 Apr 2010 15:23:03 -0000 1.36 +++ modules/image/image.module 23 Apr 2010 05:18:25 -0000 @@ -66,6 +66,13 @@ } /** + * Implements hook_init(). + */ +function image_init() { + drupal_add_css(drupal_get_path('module', 'image') . '/image.css', array('preprocess' => TRUE)); +} + +/** * Implements hook_menu(). */ function image_menu() { Index: modules/locale/locale.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.admin.inc,v retrieving revision 1.11 diff -u -r1.11 locale.admin.inc --- modules/locale/locale.admin.inc 13 Apr 2010 15:23:03 -0000 1.11 +++ modules/locale/locale.admin.inc 23 Apr 2010 05:18:25 -0000 @@ -782,7 +782,7 @@ */ 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/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1262 diff -u -r1.1262 node.module --- modules/node/node.module 13 Apr 2010 23:16:56 -0000 1.1262 +++ modules/node/node.module 23 Apr 2010 05:18:25 -0000 @@ -2006,7 +2006,7 @@ * Implements hook_init(). */ function node_init() { - drupal_add_css(drupal_get_path('module', 'node') . '/node.css'); + drupal_add_css(drupal_get_path('module', 'node') . '/node.css', array('preprocess' => TRUE)); } function node_last_changed($nid) { Index: modules/openid/openid.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v retrieving revision 1.84 diff -u -r1.84 openid.module --- modules/openid/openid.module 7 Apr 2010 16:35:03 -0000 1.84 +++ modules/openid/openid.module 23 Apr 2010 05:18:25 -0000 @@ -62,6 +62,14 @@ } /** + * Implements hook_init(). + */ +function openid_init() { + drupal_add_css(drupal_get_path('module', 'openid') . '/openid.css', array('preprocess' => TRUE)); + drupal_add_js(drupal_get_path('module', 'openid') . '/openid.js', array('preprocess' => TRUE)); +} + +/** * Implements hook_user_insert(). */ function openid_user_insert(&$edit, $account, $category) { @@ -115,8 +123,6 @@ } function _openid_user_login_form_alter(&$form, &$form_state) { - $form['#attached']['css'][] = drupal_get_path('module', 'openid') . '/openid.css'; - $form['#attached']['js'][] = drupal_get_path('module', 'openid') . '/openid.js'; $form['#attached']['library'][] = array('system', 'cookie'); if (!empty($form_state['input']['openid_identifier'])) { $form['name']['#required'] = FALSE; Index: modules/openid/openid.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.pages.inc,v retrieving revision 1.27 diff -u -r1.27 openid.pages.inc --- modules/openid/openid.pages.inc 2 Mar 2010 08:59:54 -0000 1.27 +++ modules/openid/openid.pages.inc 23 Apr 2010 05:18:25 -0000 @@ -29,7 +29,6 @@ */ function openid_user_identities($account) { drupal_set_title(format_username($account)); - drupal_add_css(drupal_get_path('module', 'openid') . '/openid.css'); // Check to see if we got a response $result = openid_complete(); Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.342 diff -u -r1.342 poll.module --- modules/poll/poll.module 13 Apr 2010 15:23:03 -0000 1.342 +++ modules/poll/poll.module 23 Apr 2010 05:18:25 -0000 @@ -31,7 +31,7 @@ * Implements hook_init(). */ function poll_init() { - drupal_add_css(drupal_get_path('module', 'poll') . '/poll.css'); + drupal_add_css(drupal_get_path('module', 'poll') . '/poll.css', array('preprocess' => TRUE)); } /** Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.344 diff -u -r1.344 search.module --- modules/search/search.module 11 Apr 2010 18:54:11 -0000 1.344 +++ modules/search/search.module 23 Apr 2010 05:18:25 -0000 @@ -145,6 +145,13 @@ } /** + * Implements hook_init(). + */ +function search_init() { + drupal_add_css(drupal_get_path('module', 'search') . '/search.css', array('preprocess' => TRUE)); +} + +/** * Implements hook_theme(). */ function search_theme() { @@ -889,9 +896,6 @@ * An HTML string containing the search form. */ 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)); - if (!$action) { $action = 'search/' . $type; } Index: modules/shortcut/shortcut.module =================================================================== RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.module,v retrieving revision 1.24 diff -u -r1.24 shortcut.module --- modules/shortcut/shortcut.module 6 Mar 2010 06:33:14 -0000 1.24 +++ modules/shortcut/shortcut.module 23 Apr 2010 05:18:26 -0000 @@ -167,6 +167,13 @@ } /** + * Implements hook_init(). + */ +function shortcut_init() { + drupal_add_css(drupal_get_path('module', 'shortcut') . '/shortcut.css', array('preprocess' => TRUE)); +} + +/** * Implements hook_theme(). */ function shortcut_theme() { @@ -661,7 +668,6 @@ if (theme_get_setting('shortcut_module_link')) { $variables['title_suffix']['add_or_remove_shortcut'] = array( - '#attached' => array('css' => array(drupal_get_path('module', 'shortcut') . '/shortcut.css')), '#prefix' => '
', '#type' => 'link', '#title' => '' . $link_text . '', Index: modules/simpletest/tests/common.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/common.test,v retrieving revision 1.109 diff -u -r1.109 common.test --- modules/simpletest/tests/common.test 11 Apr 2010 18:33:44 -0000 1.109 +++ modules/simpletest/tests/common.test 23 Apr 2010 05:18:26 -0000 @@ -576,7 +576,7 @@ 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 @@ */ 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 -r1.921 system.module --- modules/system/system.module 13 Apr 2010 15:23:03 -0000 1.921 +++ modules/system/system.module 23 Apr 2010 05:18:26 -0000 @@ -1061,6 +1061,7 @@ 'js' => array( 'misc/jquery.js' => array('weight' => JS_LIBRARY - 20), ), + 'preprocess' => TRUE, ); // jQuery Once. @@ -1071,6 +1072,7 @@ 'js' => array( 'misc/jquery.once.js' => array('weight' => JS_LIBRARY - 19), ), + 'preprocess' => TRUE, ); // jQuery Form Plugin. @@ -1115,7 +1117,7 @@ 'misc/farbtastic/farbtastic.js' => array(), ), 'css' => array( - 'misc/farbtastic/farbtastic.css' => array('preprocess' => FALSE), + 'misc/farbtastic/farbtastic.css' => array(), ), ); @@ -1804,10 +1806,10 @@ if (arg(0) == 'admin' || (variable_get('node_admin_theme', '0') && arg(0) == 'node' && (arg(1) == 'add' || arg(2) == 'edit' || arg(2) == 'delete'))) { drupal_add_css(drupal_get_path('module', 'system') . '/admin.css', array('weight' => CSS_SYSTEM)); } - drupal_add_css(drupal_get_path('module', 'system') . '/system.css', array('weight' => CSS_SYSTEM)); - drupal_add_css(drupal_get_path('module', 'system') . '/system-behavior.css', array('weight' => CSS_SYSTEM)); - drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css', array('weight' => CSS_SYSTEM)); - drupal_add_css(drupal_get_path('module', 'system') . '/system-messages.css', array('weight' => CSS_SYSTEM)); + drupal_add_css(drupal_get_path('module', 'system') . '/system.css', array('weight' => CSS_SYSTEM, 'preprocess' => TRUE)); + drupal_add_css(drupal_get_path('module', 'system') . '/system-behavior.css', array('weight' => CSS_SYSTEM, 'preprocess' => TRUE)); + drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css', array('weight' => CSS_SYSTEM, 'preprocess' => TRUE)); + drupal_add_css(drupal_get_path('module', 'system') . '/system-messages.css', array('weight' => CSS_SYSTEM, 'preprocess' => TRUE)); // Ignore slave database servers for this request. Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.585 diff -u -r1.585 taxonomy.module --- modules/taxonomy/taxonomy.module 10 Apr 2010 16:37:19 -0000 1.585 +++ modules/taxonomy/taxonomy.module 23 Apr 2010 05:18:26 -0000 @@ -338,6 +338,13 @@ } /** + * Implements hook_init(). + */ +function taxonomy_init() { + drupal_add_css(drupal_get_path('module', 'taxonomy') . '/taxonomy.css', array('preprocess' => TRUE)); +} + +/** * Return edit access for a given term. */ function taxonomy_term_edit_access($term) { @@ -596,8 +603,6 @@ '#suffix' => '
', ); - $build['#attached']['css'][] = drupal_get_path('module', 'taxonomy') . '/taxonomy.css'; - return $build; } Index: modules/tracker/tracker.module =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v retrieving revision 1.171 diff -u -r1.171 tracker.module --- modules/tracker/tracker.module 4 Dec 2009 16:49:47 -0000 1.171 +++ modules/tracker/tracker.module 23 Apr 2010 05:18:26 -0000 @@ -70,6 +70,13 @@ } /** + * Implements hook_init(). + */ +function tracker_init() { + drupal_add_css(drupal_get_path('module', 'tracker') . '/tracker.css', array('preprocess' => TRUE)); +} + +/** * Implements hook_cron(). */ function tracker_cron() { Index: modules/tracker/tracker.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v retrieving revision 1.31 diff -u -r1.31 tracker.pages.inc --- modules/tracker/tracker.pages.inc 14 Jan 2010 06:23:40 -0000 1.31 +++ modules/tracker/tracker.pages.inc 23 Apr 2010 05:18:26 -0000 @@ -113,7 +113,7 @@ '#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: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1159 diff -u -r1.1159 user.module --- modules/user/user.module 13 Apr 2010 15:23:03 -0000 1.1159 +++ modules/user/user.module 23 Apr 2010 05:18:26 -0000 @@ -1659,7 +1659,7 @@ * Implements hook_init(). */ function user_init() { - drupal_add_css(drupal_get_path('module', 'user') . '/user.css'); + drupal_add_css(drupal_get_path('module', 'user') . '/user.css', array('preprocess' => TRUE)); } /** Index: themes/garland/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.39 diff -u -r1.39 template.php --- themes/garland/template.php 4 Mar 2010 09:03:08 -0000 1.39 +++ themes/garland/template.php 23 Apr 2010 05:18:26 -0000 @@ -42,7 +42,7 @@ $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 -r1.15 template.php --- themes/seven/template.php 24 Mar 2010 09:26:37 -0000 1.15 +++ themes/seven/template.php 23 Apr 2010 05:18:26 -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))); } /**