Index: drupal/modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/Attic/user.module,v
retrieving revision 1.612.2.17
diff -u -F^f -r1.612.2.17 user.module
--- drupal/modules/user.module	3 Aug 2006 13:53:15 -0000	1.612.2.17
+++ drupal/modules/user.module	11 Sep 2006 10:16:49 -0000
@@ -1894,31 +1894,34 @@ function user_admin_role() {
     }
   }
   else if ($id) {
-    // Display the role form.
+    // Display role edit form.
     $role = db_fetch_object(db_query('SELECT * FROM {role} WHERE rid = %d', $id));
-    $form['name'] = array('#type' => 'textfield', '#title' => t('Role name'), '#default_value' => $role->name, '#size' => 30, '#maxlength' => 64, '#description' => t('The name for this role. Example: "moderator", "editorial board", "site architect".'));
+    $form['name'] = array('#type' => 'textfield', '#title' => t('Role name'), '#default_value' => $role->name, '#size' => 30, '#required' => TRUE, '#maxlength' => 64, '#description' => t('The name for this role. Example: "moderator", "editorial board", "site architect".'));
     $form['submit'] = array('#type' => 'submit', '#value' => t('Save role'));
     $form['delete'] = array('#type' => 'submit', '#value' => t('Delete role'));
-    return drupal_get_form('user_admin_role', $form);
   }
-  $form['name'] = array('#type' => 'textfield', '#size' => 32, '#maxlength' => 64);
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Add role'));
+  else {
+    $form['name'] = array('#type' => 'textfield', '#size' => 32, '#maxlength' => 64);
+    $form['submit'] = array('#type' => 'submit', '#value' => t('Add role'));
+  }
   return drupal_get_form('user_admin_new_role', $form);
 }
 
 function theme_user_admin_new_role($form) {
-  $header = array(t('Name'), t('Operations'));
-  foreach (user_roles() as $rid => $name) {
-    if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
-      $rows[] = array($name, l(t('edit'), 'admin/access/roles/edit/'. $rid));
-    }
-    else {
-      $rows[] = array($name, '<span class="disabled">'. t('locked') .'</span>');
+  if (!arg(4)) {
+    $header = array(t('Name'), t('Operations'));
+    foreach (user_roles() as $rid => $name) {
+      if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
+        $rows[] = array($name, l(t('edit'), 'admin/access/roles/edit/'. $rid));
+      }
+      else {
+        $rows[] = array($name, '<span class="disabled">'. t('locked') .'</span>');
+      }
     }
-  }
-  $rows[] = array(form_render($form['name']), form_render($form['submit']));
+    $rows[] = array(form_render($form['name']), form_render($form['submit']));
 
-  return theme('table', $header, $rows);
+    return theme('table', $header, $rows);
+  }
 }