diff options
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 91a189e2c..66cb92fa9 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1013,11 +1013,6 @@ function user_block_list() { // Not worth caching. $blocks['login']['cache'] = BLOCK_NO_CACHE; - $blocks['navigation']['info'] = t('Navigation'); - // Menu blocks can't be cached because each menu item can have - // a custom access callback. menu.inc manages its own caching. - $blocks['navigation']['cache'] = BLOCK_NO_CACHE; - $blocks['new']['info'] = t('Who\'s new'); // Too dynamic to cache. @@ -1087,13 +1082,6 @@ function user_block_view($delta = '') { } return $block; - case 'navigation': - if ($menu = menu_tree()) { - $block['subject'] = $user->uid ? check_plain($user->name) : t('Navigation'); - $block['content'] = $menu; - } - return $block; - case 'new': if (user_access('access content')) { // Retrieve a list of new users who have subsequently accessed the site successfully. @@ -1306,6 +1294,7 @@ function user_menu() { 'access callback' => 'user_is_logged_in', 'page callback' => 'user_logout', 'weight' => 10, + 'menu_name' => 'user-menu', ); // User administration pages. @@ -1372,7 +1361,8 @@ function user_menu() { 'page arguments' => array(1), 'access callback' => 'user_view_access', 'access arguments' => array(1), - 'parent' => '', + 'weight' => -10, + 'menu_name' => 'user-menu', ); $items['user/%user/view'] = array( |