Index: dhtml_menu.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.info,v
retrieving revision 1.9
diff -u -r1.9 dhtml_menu.info
--- dhtml_menu.info	25 Oct 2009 14:58:28 -0000	1.9
+++ dhtml_menu.info	7 Nov 2009 00:02:15 -0000
@@ -1,9 +1,4 @@
 ; $Id: dhtml_menu.info,v 1.9 2009/10/25 14:58:28 arancaytar Exp $
 name = DHTML Menu
 description = Opens menus dynamically to reduce page reloads.
-core = 7.x
-
-files[] = dhtml_menu.module
-files[] = dhtml_menu.install
-files[] = dhtml_menu.admin.inc
-files[] = dhtml_menu.theme.inc
+core = 6.x
Index: dhtml_menu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.module,v
retrieving revision 1.47
diff -u -r1.47 dhtml_menu.module
--- dhtml_menu.module	25 Oct 2009 14:58:28 -0000	1.47
+++ dhtml_menu.module	7 Nov 2009 00:02:15 -0000
@@ -28,7 +28,7 @@
 function dhtml_menu_init() {
   drupal_add_css(drupal_get_path('module', 'dhtml_menu') . '/dhtml_menu.css');
   drupal_add_js(drupal_get_path('module', 'dhtml_menu') . '/dhtml_menu.js');
-  drupal_add_js(array('dhtmlMenu' => variable_get('dhtml_menu_settings')), 'setting');
+  drupal_add_js(array('dhtmlMenu' => variable_get('dhtml_menu_settings', array())), 'setting');
 }
 
 /**
Index: dhtml_menu.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.install,v
retrieving revision 1.15
diff -u -r1.15 dhtml_menu.install
--- dhtml_menu.install	25 Oct 2009 14:58:28 -0000	1.15
+++ dhtml_menu.install	7 Nov 2009 00:02:15 -0000
@@ -38,7 +38,7 @@
 function dhtml_menu_enable() {
   // Register our theme interceptors.
   // This does not happen on its own because we have no hook_theme().
-  drupal_theme_rebuild();
+  drupal_rebuild_theme_registry();
   drupal_set_message(t('<em>DHTML Menu</em> offers a wide range of customization options. If you wish to change them, please visit the <a href="@url">configuration page</a>.', array('@url' => url('admin/settings/dhtml_menu'))), 'warning');
 }
 
@@ -47,7 +47,7 @@
  */
 function dhtml_menu_disable() {
   // Unregister our theme interceptors.
-  drupal_theme_rebuild();
+  drupal_rebuild_theme_registry();
 }
 
 /**
Index: dhtml_menu.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.js,v
retrieving revision 1.47
diff -u -r1.47 dhtml_menu.js
--- dhtml_menu.js	25 Oct 2009 14:36:44 -0000	1.47
+++ dhtml_menu.js	7 Nov 2009 00:02:15 -0000
@@ -10,11 +10,11 @@
 Drupal.dhtmlMenu = {};
 Drupal.dhtmlMenu.animation = {show:{}, hide:{}, count:0};
 
-/**
- * Initialize the module's JS functions
- */
-Drupal.behaviors.dhtmlMenu = {
-  attach: function() {
+  /**
+   * Initialize the module's JS functions
+   * @TODO Indentation maintained to keep coherence with HEAD.
+   */
+  Drupal.behaviors.dhtmlMenu = function() {
     var settings = Drupal.settings.dhtmlMenu;
 
     // Initialize the animation effects from the settings.
@@ -179,7 +179,6 @@
       $('.dhtml-menu-icon').css('left', shift).css('margin-right', shift);
     }
   }
-}
 
 /**
  * Toggles the menu's state between open and closed.
Index: dhtml_menu.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/dhtml_menu/dhtml_menu.theme.inc,v
retrieving revision 1.12
diff -u -r1.12 dhtml_menu.theme.inc
--- dhtml_menu.theme.inc	25 Oct 2009 14:32:36 -0000	1.12
+++ dhtml_menu.theme.inc	7 Nov 2009 00:02:16 -0000
@@ -14,8 +14,8 @@
  */
 function dhtml_menu_theme_menu_item_link($link) {
   global $theme;
-  $function = &drupal_static(__FUNCTION__);
-  $settings = variable_get('dhtml_menu_settings');
+  static $function;
+  $settings = variable_get('dhtml_menu_settings', array());
   if (!isset($function)) {
     $registry = variable_get('dhtml_menu_theme', array());
     if (isset($registry[$theme]) && function_exists($registry[$theme]['menu_item_link'])) {
@@ -54,11 +54,10 @@
  */
 function dhtml_menu_theme_menu_item($link, $has_children, $menu = '', $in_active_trail = FALSE, $extra_class = NULL) {
   global $theme;
-  $cookie   = &drupal_static(__FUNCTION__ . ':cookie', array());
-  $function = &drupal_static(__FUNCTION__ . ':function');
+  static $cookie = array(), $function;
 
   if (empty($function)) {
-    $settings = variable_get('dhtml_menu_settings');
+    $settings = variable_get('dhtml_menu_settings', array());
     if ($settings['effects']['remember'] && $settings['nav'] != 'open' && $settings['effects']['siblings'] != 'close-all') {
       $cookie = explode(',', @$_COOKIE['dhtml_menu']);
     }