Index: admin_menu.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/admin_menu/admin_menu.js,v
retrieving revision 1.7.2.7
diff -u -p -r1.7.2.7 admin_menu.js
--- admin_menu.js	24 Jan 2009 04:59:22 -0000	1.7.2.7
+++ admin_menu.js	4 Jul 2009 13:01:05 -0000
@@ -1,8 +1,12 @@
 /* $Id: admin_menu.js,v 1.7.2.7 2009/01/24 04:59:22 sun Exp $ */
 
 $(document).ready(function() {
+  if (!$('#admin-menu').length) {
+    return;
+  }
+
   // Apply margin-top if enabled; directly applying marginTop doesn't work in IE.
-  if ($('#admin-menu').size() && Drupal.settings.admin_menu) {
+  if (Drupal && Drupal.settings && Drupal.settings.admin_menu) {
     if (Drupal.settings.admin_menu.margin_top) {
       $('body').addClass('admin-menu');
     }
@@ -16,11 +20,10 @@ $(document).ready(function() {
       });
       $('ul.tabs.secondary').appendTo('#admin-menu > ul > li.admin-menu-tab.active');
     }
-  }
-
-  // Collapse fieldsets on Modules page. For why multiple selectors see #111719.
-  if (Drupal.settings.admin_menu && Drupal.settings.admin_menu.tweak_modules) {
-    $('#system-modules fieldset:not(.collapsed), #system-modules-1 fieldset:not(.collapsed)').addClass('collapsed');
+    // Collapse fieldsets on Modules page. For why multiple selectors see #111719.
+    if (Drupal.settings.admin_menu.tweak_modules) {
+      $('#system-modules fieldset:not(.collapsed), #system-modules-1 fieldset:not(.collapsed)').addClass('collapsed');
+    }
   }
 
   // Hover emulation for IE 6.