Index: me.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/me/me.module,v
retrieving revision 1.5
diff -u -r1.5 me.module
--- me.module	21 Dec 2008 22:33:01 -0000	1.5
+++ me.module	24 Dec 2008 20:01:57 -0000
@@ -126,43 +125,10 @@
     'type' => MENU_NORMAL_ITEM,
   );
 
-  // TODO: Remove when/if http://drupal.org/node/109588 gets in.
-  // Loop over each of the paths, finding all %user* loaders,
-  // and replace them with a %me equivelant. This should catch
-  // all drupal modules that use the %user loader to load up
-  // user objects, which should be most well written D6 modules.
-  $items['user/'. variable_get('me_alias', 'me') .'/edit'] = array(
-    'title' => 'Edit',
-    'page callback' => 'me_user_edit',
-    'access callback' => 'me_user_edit_access',
-    'type' => MENU_LOCAL_TASK,
-  );
-
   return $items;
 }
 
 /**
- * Menu callback to redirect to the user edit pages with the correct
- * user id.
- *
- * TODO: Remove when/if http://drupal.org/node/109588 gets in.
- */
-function me_user_edit() {
-  drupal_goto('user/'. $GLOBALS['user']->uid .'/edit');
-}
-
-/**
- * Menu access callback to check access before user edit redirection
- * takes place. This keeps 'me' in the path when access will be denied
- * anyway, and saves an extra request.
- *
- * TODO: Remove when/if http://drupal.org/node/109588 gets in.
- */
-function me_user_edit_access() {
-  return user_edit_access($GLOBALS['user']);
-}
-
-/**
  * Form callback for the admin settings form.
  */
 function me_admin_settings_form(&$form_state) {
@@ -185,10 +151,6 @@
   );
 
   $form['#validate'] = array('me_admin_settings_form_validate');
-
-  // TODO: Remove submit callback when/if http://drupal.org/node/109588 gets in.
-  $form['#submit'] = array('me_admin_settings_form_submit');
-
   return system_settings_form($form);
 }
 
@@ -200,14 +162,3 @@
     form_set_error('me_alias', t('The alias can only contain characters from a-z and A-Z.'));
   }
 }
-
-/**
- * SUbmit callback for me_admin_settings_form.
- *
- * TODO: Remove when/if http://drupal.org/node/109588 gets in.
- */
-function me_admin_settings_form_submit($form, &$form_state) {
-  // When/if the me alias changes, we need to rebuild the menu so the
-  // new alias is picked up on the user edit pages correctly.
-  menu_rebuild();
-}