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

4.7.x
Dries Buytaert 2006-01-06 07:42:31 +00:00
parent 303720fb62
commit 9d1d40e609
6 changed files with 6 additions and 16 deletions

View File

@ -50,8 +50,7 @@ function menu_menu($may_cache) {
$items[] = array('path' => 'admin/settings/menu', $items[] = array('path' => 'admin/settings/menu',
'title' => t('menus'), 'title' => t('menus'),
'callback' => 'menu_configure', 'callback' => 'menu_configure');
'access' => user_access('administer menu'));
} }
return $items; return $items;

View File

@ -50,8 +50,7 @@ function menu_menu($may_cache) {
$items[] = array('path' => 'admin/settings/menu', $items[] = array('path' => 'admin/settings/menu',
'title' => t('menus'), 'title' => t('menus'),
'callback' => 'menu_configure', 'callback' => 'menu_configure');
'access' => user_access('administer menu'));
} }
return $items; return $items;

View File

@ -121,19 +121,15 @@ function profile_menu($may_cache) {
'access' => user_access('access user profiles'), 'access' => user_access('access user profiles'),
'type' => MENU_SUGGESTED_ITEM); 'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'admin/settings/profile', 'title' => t('profiles'), $items[] = array('path' => 'admin/settings/profile', 'title' => t('profiles'),
'callback' => 'profile_admin_overview', 'callback' => 'profile_admin_overview');
'access' => user_access('administer users'));
$items[] = array('path' => 'admin/settings/profile/add', 'title' => t('add field'), $items[] = array('path' => 'admin/settings/profile/add', 'title' => t('add field'),
'callback' => 'profile_admin_add', 'callback' => 'profile_admin_add',
'access' => user_access('administer users'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/settings/profile/edit', 'title' => t('edit field'), $items[] = array('path' => 'admin/settings/profile/edit', 'title' => t('edit field'),
'callback' => 'profile_admin_edit', 'callback' => 'profile_admin_edit',
'access' => user_access('administer users'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/settings/profile/delete', 'title' => t('delete field'), $items[] = array('path' => 'admin/settings/profile/delete', 'title' => t('delete field'),
'callback' => 'profile_admin_delete', 'callback' => 'profile_admin_delete',
'access' => user_access('administer users'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
} }

View File

@ -121,19 +121,15 @@ function profile_menu($may_cache) {
'access' => user_access('access user profiles'), 'access' => user_access('access user profiles'),
'type' => MENU_SUGGESTED_ITEM); 'type' => MENU_SUGGESTED_ITEM);
$items[] = array('path' => 'admin/settings/profile', 'title' => t('profiles'), $items[] = array('path' => 'admin/settings/profile', 'title' => t('profiles'),
'callback' => 'profile_admin_overview', 'callback' => 'profile_admin_overview');
'access' => user_access('administer users'));
$items[] = array('path' => 'admin/settings/profile/add', 'title' => t('add field'), $items[] = array('path' => 'admin/settings/profile/add', 'title' => t('add field'),
'callback' => 'profile_admin_add', 'callback' => 'profile_admin_add',
'access' => user_access('administer users'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/settings/profile/edit', 'title' => t('edit field'), $items[] = array('path' => 'admin/settings/profile/edit', 'title' => t('edit field'),
'callback' => 'profile_admin_edit', 'callback' => 'profile_admin_edit',
'access' => user_access('administer users'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/settings/profile/delete', 'title' => t('delete field'), $items[] = array('path' => 'admin/settings/profile/delete', 'title' => t('delete field'),
'callback' => 'profile_admin_delete', 'callback' => 'profile_admin_delete',
'access' => user_access('administer users'),
'type' => MENU_CALLBACK); 'type' => MENU_CALLBACK);
} }

View File

@ -695,7 +695,7 @@ function user_menu($may_cache) {
'callback' => 'user_admin', 'access' => $admin_access, 'callback' => 'user_admin', 'access' => $admin_access,
'type' => MENU_LOCAL_TASK); 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/settings/user', 'title' => t('users'), $items[] = array('path' => 'admin/settings/user', 'title' => t('users'),
'callback' => 'user_configure', 'access' => $admin_access); 'callback' => 'user_configure');
//admin access pages //admin access pages
$items[] = array('path' => 'admin/access', 'title' => t('access control'), $items[] = array('path' => 'admin/access', 'title' => t('access control'),

View File

@ -695,7 +695,7 @@ function user_menu($may_cache) {
'callback' => 'user_admin', 'access' => $admin_access, 'callback' => 'user_admin', 'access' => $admin_access,
'type' => MENU_LOCAL_TASK); 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/settings/user', 'title' => t('users'), $items[] = array('path' => 'admin/settings/user', 'title' => t('users'),
'callback' => 'user_configure', 'access' => $admin_access); 'callback' => 'user_configure');
//admin access pages //admin access pages
$items[] = array('path' => 'admin/access', 'title' => t('access control'), $items[] = array('path' => 'admin/access', 'title' => t('access control'),