1 files changed, 20 insertions, 18 deletions

diff --git a/modules/user/user.module b/modules/user/user.module
index c4d52b081..ff92c54fd 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -730,11 +730,15 @@ function user_menu() {
   );
 
   // Registration and login pages.
-  $items['user/login'] = array(
+  $items['user'] = array(
     'title' => t('Log in'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_login'),
     'access callback' => 'user_is_anonymous',
+  );
+
+  $items['user/login'] = array(
+    'title' => t('Log in'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
 
@@ -857,7 +861,6 @@ function user_menu() {
       'page callback' => 'user_admin',
       'page arguments' => array('search'),
       'access arguments' => array('administer users'),
-      'type' => MENU_NORMAL_ITEM,
     );
   }
 
@@ -868,32 +871,22 @@ function user_menu() {
     'weight' => 10,
   );
 
-  $items['user'] = array(
-    'title' => t('My account'),
-    'page callback' => 'user_view',
-    'page arguments' => array(1),
-    'access callback' => 'user_view_access',
-    'access arguments' => array(1),
-    'map callback' => 'user_load_self',
-  );
-
-  $items['user/%'] = array(
+  $items['user/%user_current'] = array(
     'title' => t('My account'),
     'page callback' => 'user_view',
     'page arguments' => array(1),
     'access callback' => 'user_view_access',
     'access arguments' => array(1),
-    'map arguments' => array('user_load', 1),
-    'type' => MENU_CALLBACK,
+    'parent' => '',
   );
 
-  $items['user/%/view'] = array(
+  $items['user/%user/view'] = array(
     'title' => t('View'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
 
-  $items['user/%/delete'] = array(
+  $items['user/%user/delete'] = array(
     'title' => t('Delete'),
     'page callback' => 'user_edit',
     'access callback' => 'user_access',
@@ -901,7 +894,7 @@ function user_menu() {
     'type' => MENU_CALLBACK,
   );
 
-  $items['user/%/edit'] = array(
+  $items['user/%user/edit'] = array(
     'title' => t('Edit'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_edit'),
@@ -913,7 +906,7 @@ function user_menu() {
   $empty_account = new stdClass();
   if (($categories = _user_categories($empty_account)) && (count($categories) > 1)) {
     foreach ($categories as $key => $category) {
-      $items['user/%/edit/'. $category['name']] = array(
+      $items['user/%user/edit/'. $category['name']] = array(
         'title' => $category['title'],
         'page arguments' => array('user_edit', 3),
         'type' => $category['name'] == 'account' ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
@@ -928,6 +921,14 @@ function user_init() {
   drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'module');
 }
 
+function user_current_load($arg) {
+  return user_load($arg);
+}
+
+function user_current_to_arg() {
+  return $GLOBALS['user']->uid;
+}
+
 /**
  * Accepts an user object, $account, or a DA name and returns an associative
  * array of modules and DA names. Called at external login.
@@ -1588,6 +1589,7 @@ function user_edit_submit($form_id, $form_values) {
 function user_view($account) {
   global $user;
 
+  drupal_set_title(check_plain($account->name));
   // Retrieve and merge all profile fields:
   $fields = array();
   foreach (module_list() as $module) {