Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.960
diff -u -p -r1.960 node.module
--- modules/node/node.module	2 May 2008 15:11:05 -0000	1.960
+++ modules/node/node.module	6 May 2008 06:18:38 -0000
@@ -1355,6 +1355,13 @@ function node_link($type, $node = NULL, 
   $links = array();
 
   if ($type == 'node') {
+    if (!$teaser && !empty($node->nid) && node_access('delete', $node)) {
+      $links['node_delete'] = array(
+        'title' => t('Delete'),
+        'href' => 'node/' . $node->nid . '/delete',
+        'attributes' => array('title' => t('Delete this post.')),
+      );
+    }
     if ($teaser == 1 && $node->teaser && !empty($node->readmore)) {
       $links['node_read_more'] = array(
         'title' => t('Read more'),
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.30
diff -u -p -r1.30 node.pages.inc
--- modules/node/node.pages.inc	14 Apr 2008 17:48:38 -0000	1.30
+++ modules/node/node.pages.inc	6 May 2008 06:18:39 -0000
@@ -240,14 +240,6 @@ function node_form(&$form_state, $node) 
     '#weight' => 10,
     '#submit' => array('node_form_build_preview'),
   );
-  if (!empty($node->nid) && node_access('delete', $node)) {
-    $form['buttons']['delete'] = array(
-      '#type' => 'submit',
-      '#value' => t('Delete'),
-      '#weight' => 15,
-      '#submit' => array('node_form_delete_submit'),
-    );
-  }
   $form['#validate'][] = 'node_form_validate';
   $form['#theme'] = array($node->type . '_node_form', 'node_form');
   return $form;
@@ -296,20 +288,6 @@ function node_body_field(&$node, $label,
   return $form;
 }
 
-/**
- * Button sumit function: handle the 'Delete' button on the node form.
- */
-function node_form_delete_submit($form, &$form_state) {
-  $destination = '';
-  if (isset($_REQUEST['destination'])) {
-    $destination = drupal_get_destination();
-    unset($_REQUEST['destination']);
-  }
-  $node = $form['#node'];
-  $form_state['redirect'] = array('node/' . $node->nid . '/delete', $destination);
-}
-
-
 function node_form_build_preview($form, &$form_state) {
   $node = node_form_submit_build_node($form, $form_state);
   $form_state['node_preview'] = node_preview($node);