summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2008-11-27 07:07:01 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2008-11-27 07:07:01 +0000
commitd7f706f29117e4003179ab15e305446c6e95d0f9 (patch)
tree7ec0aeef58819d6947879cd9ec7734664b44fded /modules/user
parent74f2efd561ed37512456be6afaf7f00a7e5eea44 (diff)
downloadbrdo-d7f706f29117e4003179ab15e305446c6e95d0f9.tar.gz
brdo-d7f706f29117e4003179ab15e305446c6e95d0f9.tar.bz2
Reverting #337820 once more, as it causes mysterious test failures.
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.module14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 0ee98a979..cdb912d92 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',