Index: node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.485
diff -F^f -u -r1.485 node.module
--- node.module	5 Apr 2005 07:25:11 -0000	1.485
+++ node.module	6 Apr 2005 05:02:06 -0000
@@ -1708,12 +1708,12 @@ function node_page() {
       break;
     case 'delete':
     case t('Delete'):
-      // Note: we redirect from node/uid/edit to node/uid/delete to make the tabs disappear.
-      if ($_GET['q'] == 'node/'. arg(1) .'/edit') {
-        unset($_REQUEST['destination']);
-        drupal_goto('node/'. arg(1) .'/delete');
-      }
       $edit['nid'] = $edit['nid'] ? $edit['nid'] : arg(1);
+      $node = node_load(array('nid' => $edit['nid']));
+      $bc[] = array('path' => 'node/'. $edit['nid'], 'title' => $node->title);
+      $bc[] = array('path' => 'node/'. arg(1) .'/delete', 'title' => t('delete'));
+      menu_set_location($bc);
+      
       $output = node_delete($edit);
       if (!$output) {
         drupal_set_message(t('The node has been deleted.'));
Index: user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.454
diff -F^f -u -r1.454 user.module
--- user.module	1 Apr 2005 15:55:02 -0000	1.454
+++ user.module	6 Apr 2005 05:02:34 -0000
@@ -1139,7 +1139,10 @@ function user_edit($category = 'account'
       }
     }
   }
-  else if (arg(2) == 'delete') {
+  else if (arg(2) == 'delete' || $_POST['op'] == t('Delete')) {
+    $bc[] = array('path' => 'admin/users', 'title' => 'administer users');
+    $bc[] = array('path' => 'user/'. arg(1) .'/delete', 'title' => t('delete'));
+    menu_set_location($bc);
     if ($edit['confirm']) {
       db_query('DELETE FROM {users} WHERE uid = %d', $account->uid);
       db_query('DELETE FROM {users_roles} WHERE uid = %d', $account->uid);
@@ -1158,10 +1161,6 @@ function user_edit($category = 'account'
       return;
     }
   }
-  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'));