summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-09-24 00:37:45 +0000
committerDries Buytaert <dries@buytaert.net>2010-09-24 00:37:45 +0000
commitc9de4646c570a45de03d6e7ec470daf01a8d2cab (patch)
tree5d8781ec52d1cf25c5ca1a842d2a7a65bf0f7e95 /modules/user
parent4bd74a00668557ce827e4c51d7c278548518aaf8 (diff)
downloadbrdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.gz
brdo-c9de4646c570a45de03d6e7ec470daf01a8d2cab.tar.bz2
- Patch #907690 by sun, pwolanin: breadcrumbs don't work for dynamic paths and local tasks #2.
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/user.module11
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index b43b689fd..53172a83c 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1522,7 +1522,12 @@ function user_menu() {
'title' => 'User account',
'page callback' => 'user_page',
'access callback' => TRUE,
- 'type' => MENU_CALLBACK,
+ // Edge-case: No menu links should be auto-generated for this and below
+ // items, which makes it a MENU_CALLBACK. However, this item's title is
+ // expected to appear on user login, register, and password pages, so we
+ // need to use MENU_VISIBLE_IN_BREADCRUMB to make
+ // menu_get_active_breadcrumb() account for it.
+ 'type' => MENU_VISIBLE_IN_BREADCRUMB,
'file' => 'user.pages.inc',
);
@@ -1617,7 +1622,6 @@ function user_menu() {
'page arguments' => array('user_admin_role', 5),
'access callback' => 'user_role_edit_access',
'access arguments' => array(5),
- 'type' => MENU_CALLBACK,
);
$items['admin/people/permissions/roles/delete/%user_role'] = array(
'title' => 'Delete role',
@@ -1625,7 +1629,6 @@ function user_menu() {
'page arguments' => array('user_admin_role_delete_confirm', 5),
'access callback' => 'user_role_edit_access',
'access arguments' => array(5),
- 'type' => MENU_CALLBACK,
'file' => 'user.admin.inc',
);
@@ -1688,7 +1691,6 @@ function user_menu() {
'page arguments' => array('user_cancel_confirm_form', 1),
'access callback' => 'user_cancel_access',
'access arguments' => array(1),
- 'type' => MENU_CALLBACK,
'file' => 'user.pages.inc',
);
@@ -1698,7 +1700,6 @@ function user_menu() {
'page arguments' => array(1, 4, 5),
'access callback' => 'user_cancel_access',
'access arguments' => array(1),
- 'type' => MENU_CALLBACK,
'file' => 'user.pages.inc',
);