Commit 9d1d40e6 authored by Dries's avatar Dries

- Patch #39639 by Richard: 'users' appearing twice in menu.

parent 303720fb
......@@ -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;
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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);
}
......
......@@ -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'),
......
......@@ -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'),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment