diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2c75b6da54e290fe381bd69e5adf20a45a6e6da7..0ab28590d88f469c8fd3b650431587d4506c010a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ Admin Menu x.x-x.x, xxxx-xx-xx Admin Menu 7.x-3.x, xxxx-xx-xx ------------------------------ +#671760 by sun: Updated for new preprocess defaults. #731462 by sun: Updated for system_rebuild_theme_data(). by sun: Re-added a "Rebuild system links" button to settings form. #420816 by tim.plunkett: Updated taxonomy path map for machine names. diff --git a/admin_devel/admin_devel.info b/admin_devel/admin_devel.info index 73dbde42bbdb388870176352bde132faf9727391..59640c919bb9afbfe9b70cd75e9ed59d81a6028f 100644 --- a/admin_devel/admin_devel.info +++ b/admin_devel/admin_devel.info @@ -3,4 +3,5 @@ name = Administration Development tools description = Administration and debugging functionality for developers and site builders. package = Administration core = 7.x +scripts[] = admin_devel.js files[] = admin_devel.module diff --git a/admin_devel/admin_devel.module b/admin_devel/admin_devel.module index 16e9894a39bc986f566ca92f124a96d8d3f05877..9bcd4737d237d63dfb16fef0bccc50a81d2dc4df 100644 --- a/admin_devel/admin_devel.module +++ b/admin_devel/admin_devel.module @@ -6,13 +6,6 @@ * Administration and debugging functionality for developers and site builders. */ -/** - * Implements hook_init(). - */ -function admin_devel_init() { - drupal_add_js(drupal_get_path('module', 'admin_devel') . '/admin_devel.js'); -} - /** * Implements hook_form_FORMID_alter(). */ diff --git a/admin_menu.module b/admin_menu.module index 770d58dbcc2c626494a79086e70a6a27ce0280b2..e33bcc830e38fa68b4e53c84ac4923a1f295c5b9 100644 --- a/admin_menu.module +++ b/admin_menu.module @@ -129,9 +129,9 @@ function admin_menu_init() { global $user, $language; $path = drupal_get_path('module', 'admin_menu'); - drupal_add_css($path . '/admin_menu.css', array('preprocess' => FALSE)); + drupal_add_css($path . '/admin_menu.css'); if ($user->uid == 1) { - drupal_add_css($path . '/admin_menu.uid1.css', array('preprocess' => FALSE)); + drupal_add_css($path . '/admin_menu.uid1.css'); } // Performance: Defer execution. drupal_add_js($path . '/admin_menu.js', array('defer' => TRUE));