diff options
author | Dries Buytaert <dries@buytaert.net> | 2006-01-06 07:42:31 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2006-01-06 07:42:31 +0000 |
commit | 9d1d40e609061a3498d1eeee3d733513a462df37 (patch) | |
tree | 3d96948ae417efbb5817e7f1395c489414851fa0 /modules | |
parent | 303720fb6294d9bc3884c4809ae5664d00a5977f (diff) | |
download | brdo-9d1d40e609061a3498d1eeee3d733513a462df37.tar.gz brdo-9d1d40e609061a3498d1eeee3d733513a462df37.tar.bz2 |
- Patch #39639 by Richard: 'users' appearing twice in menu.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/menu.module | 3 | ||||
-rw-r--r-- | modules/menu/menu.module | 3 | ||||
-rw-r--r-- | modules/profile.module | 6 | ||||
-rw-r--r-- | modules/profile/profile.module | 6 | ||||
-rw-r--r-- | modules/user.module | 2 | ||||
-rw-r--r-- | modules/user/user.module | 2 |
6 files changed, 6 insertions, 16 deletions
diff --git a/modules/menu.module b/modules/menu.module index ff180f50b..7358d14ec 100644 --- a/modules/menu.module +++ b/modules/menu.module @@ -50,8 +50,7 @@ function menu_menu($may_cache) { $items[] = array('path' => 'admin/settings/menu', 'title' => t('menus'), - 'callback' => 'menu_configure', - 'access' => user_access('administer menu')); + 'callback' => 'menu_configure'); } return $items; diff --git a/modules/menu/menu.module b/modules/menu/menu.module index ff180f50b..7358d14ec 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -50,8 +50,7 @@ function menu_menu($may_cache) { $items[] = array('path' => 'admin/settings/menu', 'title' => t('menus'), - 'callback' => 'menu_configure', - 'access' => user_access('administer menu')); + 'callback' => 'menu_configure'); } return $items; diff --git a/modules/profile.module b/modules/profile.module index ea2279cf5..6db0b3068 100644 --- a/modules/profile.module +++ b/modules/profile.module @@ -121,19 +121,15 @@ function profile_menu($may_cache) { 'access' => user_access('access user profiles'), 'type' => MENU_SUGGESTED_ITEM); $items[] = array('path' => 'admin/settings/profile', 'title' => t('profiles'), - 'callback' => 'profile_admin_overview', - 'access' => user_access('administer users')); + 'callback' => 'profile_admin_overview'); $items[] = array('path' => 'admin/settings/profile/add', 'title' => t('add field'), 'callback' => 'profile_admin_add', - 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/settings/profile/edit', 'title' => t('edit field'), 'callback' => 'profile_admin_edit', - 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/settings/profile/delete', 'title' => t('delete field'), 'callback' => 'profile_admin_delete', - 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); } diff --git a/modules/profile/profile.module b/modules/profile/profile.module index ea2279cf5..6db0b3068 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -121,19 +121,15 @@ function profile_menu($may_cache) { 'access' => user_access('access user profiles'), 'type' => MENU_SUGGESTED_ITEM); $items[] = array('path' => 'admin/settings/profile', 'title' => t('profiles'), - 'callback' => 'profile_admin_overview', - 'access' => user_access('administer users')); + 'callback' => 'profile_admin_overview'); $items[] = array('path' => 'admin/settings/profile/add', 'title' => t('add field'), 'callback' => 'profile_admin_add', - 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/settings/profile/edit', 'title' => t('edit field'), 'callback' => 'profile_admin_edit', - 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/settings/profile/delete', 'title' => t('delete field'), 'callback' => 'profile_admin_delete', - 'access' => user_access('administer users'), 'type' => MENU_CALLBACK); } diff --git a/modules/user.module b/modules/user.module index 75490a142..2d12f6445 100644 --- a/modules/user.module +++ b/modules/user.module @@ -695,7 +695,7 @@ function user_menu($may_cache) { 'callback' => 'user_admin', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/settings/user', 'title' => t('users'), - 'callback' => 'user_configure', 'access' => $admin_access); + 'callback' => 'user_configure'); //admin access pages $items[] = array('path' => 'admin/access', 'title' => t('access control'), diff --git a/modules/user/user.module b/modules/user/user.module index 75490a142..2d12f6445 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -695,7 +695,7 @@ function user_menu($may_cache) { 'callback' => 'user_admin', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK); $items[] = array('path' => 'admin/settings/user', 'title' => t('users'), - 'callback' => 'user_configure', 'access' => $admin_access); + 'callback' => 'user_configure'); //admin access pages $items[] = array('path' => 'admin/access', 'title' => t('access control'), |