- Patch #536570 by Gábor Hojtsy: implemented new IA for top-level users.

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index a71033bcb..6a05e6552 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -114,7 +114,7 @@ function user_filter_form_submit($form, &$form_state) {
       return;
   }
 
-  $form_state['redirect'] = 'admin/user/user';
+  $form_state['redirect'] = 'admin/user';
   return;
 }
 
@@ -297,7 +297,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/user/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/settings/permissions'))),
   );
   $form['registration_cancellation']['user_cancel_method'] += user_cancel_methods();
   foreach (element_children($form['registration_cancellation']['user_cancel_method']) as $element) {
@@ -728,7 +728,7 @@ function user_admin_role() {
   $rid = arg(4);
   if ($rid) {
     if ($rid == DRUPAL_ANONYMOUS_RID || $rid == DRUPAL_AUTHENTICATED_RID) {
-      drupal_goto('admin/user/roles');
+      drupal_goto('admin/settings/roles');
     }
     // Display the edit role form.
     $role = db_query('SELECT * FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchObject();
@@ -817,7 +817,7 @@ function user_admin_role_submit($form, &$form_state) {
       ->execute();
     drupal_set_message(t('The role has been added.'));
   }
-  $form_state['redirect'] = 'admin/user/roles';
+  $form_state['redirect'] = 'admin/settings/roles';
   return;
 }
 
@@ -874,9 +874,9 @@ function theme_user_admin_account($form) {
 function theme_user_admin_new_role($form) {
   $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => 2));
   foreach (user_roles() as $rid => $name) {
-    $edit_permissions = l(t('edit permissions'), 'admin/user/permissions/' . $rid);
+    $edit_permissions = l(t('edit permissions'), 'admin/settings/permissions/' . $rid);
     if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
-      $rows[] = array($name, l(t('edit role'), 'admin/user/roles/edit/' . $rid), $edit_permissions);
+      $rows[] = array($name, l(t('edit role'), 'admin/settings/roles/edit/' . $rid), $edit_permissions);
     }
     else {
       $rows[] = array($name, t('locked'), $edit_permissions);