diff options
Diffstat (limited to 'modules/user/user.admin.inc')
-rw-r--r-- | modules/user/user.admin.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index 9eed7c5cc..44575850b 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -315,7 +315,7 @@ function user_admin_settings() { $form['registration_cancellation']['user_cancel_method'] = array( '#type' => 'item', '#title' => t('When cancelling a user account'), - '#description' => t('Users with the %select-cancel-method or %administer-users <a href="@permissions-url">permissions</a> can override this default method.', array('%select-cancel-method' => t('Select method for cancelling account'), '%administer-users' => t('Administer users'), '@permissions-url' => url('admin/config/people/permissions'))), + '#description' => t('Users with the %select-cancel-method or %administer-users <a href="@permissions-url">permissions</a> can override this default method.', array('%select-cancel-method' => t('Select method for cancelling account'), '%administer-users' => t('Administer users'), '@permissions-url' => url('admin/people/permissions'))), ); $form['registration_cancellation']['user_cancel_method'] += user_cancel_methods(); foreach (element_children($form['registration_cancellation']['user_cancel_method']) as $element) { @@ -776,7 +776,7 @@ function user_admin_role() { $rid = arg(5); if ($rid) { if ($rid == DRUPAL_ANONYMOUS_RID || $rid == DRUPAL_AUTHENTICATED_RID) { - drupal_goto('admin/config/people/roles'); + drupal_goto('admin/people/permissions/roles'); } // Display the edit role form. $role = db_query('SELECT * FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchObject(); @@ -852,7 +852,7 @@ function user_admin_role_submit($form, &$form_state) { user_role_save($role); drupal_set_message(t('The role has been added.')); } - $form_state['redirect'] = 'admin/config/people/roles'; + $form_state['redirect'] = 'admin/people/permissions/roles'; return; } @@ -866,12 +866,12 @@ function theme_user_admin_new_role($variables) { $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => 2)); foreach (user_roles() as $rid => $name) { - $edit_permissions = l(t('edit permissions'), 'admin/config/people/permissions/' . $rid); + $edit_permissions = l(t('edit permissions'), 'admin/people/permissions/' . $rid); if (in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) { $rows[] = array(t('!name %locked', array('!name' => $name, '%locked' => t('(locked)'))), '', $edit_permissions); } else { - $rows[] = array($name, l(t('edit role'), 'admin/config/people/roles/edit/' . $rid), $edit_permissions); + $rows[] = array($name, l(t('edit role'), 'admin/people/permissions/roles/edit/' . $rid), $edit_permissions); } } $rows[] = array(array('data' => drupal_render($form['name']) . drupal_render($form['submit']), 'colspan' => 3, 'class' => 'edit-name')); |