diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-24 04:22:02 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2008-11-24 04:22:02 +0000 |
| commit | bd9554952c02b4ea70103a87d3b7ef51af29f9d4 (patch) | |
| tree | 213e7f7231daba3286499a8d6061f11e01a894b4 /modules/user/user.module | |
| parent | 3d1dcb496641993d2da76b70e2ffc02af41aec34 (diff) | |
| download | brdo-bd9554952c02b4ea70103a87d3b7ef51af29f9d4.tar.gz brdo-bd9554952c02b4ea70103a87d3b7ef51af29f9d4.tar.bz2 | |
Reverting #337820 which causes menu tests to fail, unbeknownst to testing bot. Hrm...
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 3f3bedb25..6e8b83a80 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -977,13 +977,6 @@ function user_menu() { 'type' => MENU_CALLBACK, ); - $items['user/logout'] = array( - 'title' => 'Log out', - 'access callback' => 'user_is_logged_in', - 'page callback' => 'user_logout', - 'weight' => 10, - ); - // User administration pages. $items['admin/user'] = array( 'title' => 'User management', @@ -1040,6 +1033,13 @@ function user_menu() { 'type' => MENU_CALLBACK, ); + $items['logout'] = array( + 'title' => 'Log out', + 'access callback' => 'user_is_logged_in', + 'page callback' => 'user_logout', + 'weight' => 10, + ); + $items['user/%user_uid_optional'] = array( 'title' => 'My account', 'title callback' => 'user_page_title', @@ -2415,3 +2415,4 @@ function _user_forms(&$edit, $account, $category, $hook = 'form') { return empty($groups) ? FALSE : $groups; } + |