Index: user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.509
diff -u -F^f -r1.509 user.module
--- user.module	8 Sep 2005 19:46:05 -0000	1.509
+++ user.module	11 Sep 2005 17:08:37 -0000
@@ -1238,7 +1238,10 @@ function user_edit($category = 'account'
       }
     }
   }
-  else if (arg(2) == 'delete') {
+  else if (arg(2) == 'delete' || $_POST['op'] == t('Delete')) {
+    $breadcrumb[] = array('path' => 'admin/users', 'title' => 'administer users');
+    $breadcrumb[] = array('path' => 'user/'. arg(1) .'/delete', 'title' => t('delete'));
+    menu_set_location($breadcrumb);
     if ($edit['confirm']) {
       db_query('DELETE FROM {users} WHERE uid = %d', $account->uid);
       db_query('DELETE FROM {users_roles} WHERE uid = %d', $account->uid);
@@ -1256,10 +1259,6 @@ function user_edit($category = 'account'
       return $output;
     }
   }
-  else if ($_POST['op'] == t('Delete')) {
-    // Note: we redirect from user/uid/edit to user/uid/delete to make the tabs disappear.
-    drupal_goto("user/$account->uid/delete");
-  }
 
   $output  = _user_forms($edit, $account, $category);
   $output .= form_submit(t('Submit'));
@@ -1617,7 +1616,7 @@ function user_admin_role() {
   $id = arg(4);
 
   if ($op == t('Save role')) {
-    if ($edit['name']) {
+    if (isset($edit['name']) && strlen($edit['name'])) {
       db_query("UPDATE {role} SET name = '%s' WHERE rid = %d", $edit['name'], $id);
       drupal_set_message(t('The changes have been saved.'));
     }