summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--admin_devel/admin_devel.info1
-rw-r--r--admin_devel/admin_devel.module7
-rw-r--r--admin_menu.module4
4 files changed, 4 insertions, 9 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 2c75b6d..0ab2859 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 73dbde4..59640c9 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 16e9894..9bcd473 100644
--- a/admin_devel/admin_devel.module
+++ b/admin_devel/admin_devel.module
@@ -7,13 +7,6 @@
*/
/**
- * Implements hook_init().
- */
-function admin_devel_init() {
- drupal_add_js(drupal_get_path('module', 'admin_devel') . '/admin_devel.js');
-}
-
-/**
* Implements hook_form_FORMID_alter().
*/
function admin_devel_form_admin_menu_theme_settings_alter(&$form, &$form_state) {
diff --git a/admin_menu.module b/admin_menu.module
index 770d58d..e33bcc8 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));