Index: dhtml_menu.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.js,v
retrieving revision 1.13
diff -u -p -r1.13 dhtml_menu.js
--- dhtml_menu.js	11 May 2008 12:51:24 -0000	1.13
+++ dhtml_menu.js	23 Jun 2008 09:35:43 -0000
@@ -26,6 +26,7 @@ Drupal.behaviors.dhtmlMenu = function(co
         submenu = document.getElementById(cookieList[i]);
         menu = document.getElementById('menu-' + cookieList[i]);
         $(menu).removeClass('collapsed').addClass('expanded');
+        $(submenu).removeClass('sub-collapsed').addClass('sub-expanded');
         $(submenu).show();
         $(submenu).css('display', 'block');
       }
@@ -91,7 +92,7 @@ Drupal.dhtmlMenu.cookieSet = function() 
 
   // Get a list of menu IDs, saparated by comma
   $('div.submenu').each(function(i) {
-    if (this.style.display != 'none') {
+    if ($(this).hasClass('sub-expanded')) {
       if (menus != '') {
         menus += ',';
       }
@@ -139,6 +140,7 @@ Drupal.dhtmlMenu.switchMenu = function(s
 
     // Set the parent menu item as collapsed
     $(parent_menu).removeClass('expanded').addClass('collapsed');
+    $(submenu).removeClass('sub-expanded').addClass('sub-collapsed');
   }
   else {
     if (Drupal.settings.dhtmlMenu_hideSiblings) {
@@ -154,6 +156,7 @@ Drupal.dhtmlMenu.switchMenu = function(s
       $(submenu).css('display', 'block');
     }
     $(parent_menu).removeClass('collapsed').addClass('expanded');
+    $(submenu).removeClass('sub-collapsed').addClass('sub-expanded');
   }
 
   // After all changes, save the current state