### Eclipse Workspace Patch 1.0
#P me-6.x-2.x
Index: me.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/me/me.install,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 me.install
--- me.install	25 Feb 2009 01:49:28 -0000	1.2.2.4
+++ me.install	18 Mar 2009 21:05:40 -0000
@@ -19,7 +19,6 @@
     'me_paths',
     'me_redirect_anonymous',
     'me_rewrite_link',
-    'me_theme_menu_item_link_func',
     'me_user_override',
   );
 
Index: me.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/me/me.module,v
retrieving revision 1.5.2.7.2.2
diff -u -r1.5.2.7.2.2 me.module
--- me.module	2 Mar 2009 21:33:06 -0000	1.5.2.7.2.2
+++ me.module	18 Mar 2009 21:05:41 -0000
@@ -34,7 +34,6 @@
  */
 function me_theme_registry_alter(&$theme_registry) {
   if (isset($theme_registry['menu_item_link']['function'])) {
-    variable_set('me_theme_menu_item_link_func', $theme_registry['menu_item_link']['function']);
     $theme_registry['menu_item_link']['function'] = 'me_theme_menu_item_link';
   }
 }
@@ -51,7 +50,20 @@
  */
 function me_theme_menu_item_link($link) {
   _me_check_path($link);
-  $function = me_variable_get('me_theme_menu_item_link_func');
+
+  if (isset($GLOBALS['custom_theme']) && function_exists($GLOBALS['custom_theme'] .'_menu_item_link')) {
+    $function = $GLOBALS['custom_theme'] .'_menu_item_link';
+  }
+  elseif (isset($GLOBALS['theme_key']) && function_exists($GLOBALS['theme_key'] .'_menu_item_link')) {
+    $function = $GLOBALS['theme_key'] .'_menu_item_link';
+  }
+  elseif (isset($GLOBALS['theme_engine']) && function_exists($GLOBALS['theme_engine'] .'_menu_item_link')) {
+    $function = $GLOBALS['theme_engine'] .'_menu_item_link';
+  }
+  else {
+    $function = 'theme_menu_item_link';
+  }
+
   return $function($link);
 }
 
@@ -103,7 +115,6 @@
     'me_paths' => '',
     'me_redirect_anonymous' => '',
     'me_rewrite_link' => TRUE,
-    'me_theme_menu_item_link_func' => 'theme_menu_item_link',
     'me_user_override' => FALSE,
   );