--- trackback.module.bak	2006-12-03 19:11:43.000000000 -0600
+++ trackback.module	2006-12-05 19:31:05.000000000 -0600
@@ -128,7 +128,8 @@ function trackback_received_delete() {
         db_query("DELETE FROM {spam_tracker} WHERE id = %d AND source = 'trackback'", $trid);
         spam_log(SPAM_LOG, t('spam_delete_trackback: deleted trackback.'), 'trackback', $trid);
       }
-      drupal_goto('node/'. $trackback_received->nid .'#trackbacks');
+      drupal_set_message(t('The trackback has been deleted.'));
+      drupal_goto('node/'. $trackback_received->nid, NULL, 'trackbacks');
     }
     else {
       return confirm_form('trackback_received_delete_confirm', array(),
@@ -362,7 +363,7 @@ function trackback_admin_overview($type 
   $spam_module_exists = module_exist('spam');
 
   $operations = array();
-  if (module_exist('spam')) {
+  if ($spam_module_exists) {
     $operations['spam_spam_trackback'] = t('Mark the selected trackbacks as spam');
     $operations['spam_notspam_trackback'] = t('Mark the selected trackbacks as not spam');
   }
@@ -372,12 +373,7 @@ function trackback_admin_overview($type 
   else {
     $operations['spam_publish_trackback'] = t('Publish the selected trackbacks');
   }
-  if (module_exist('spam')) {
-    $operations['spam_delete_trackback'] = t('Delete the selected trackbacks (no confirmation)');
-  }
-  else {
-    $operations['trackback_delete'] = t('Delete the selected trackbacks (no confirmation)');
-  }
+  $operations['spam_delete_trackback'] = t('Delete the selected trackbacks (no confirmation)');
 
   if ($op = $_POST['op']) {
     $edit = $_POST['edit'];
@@ -699,7 +695,7 @@ function trackback_delete($trackback) {
     db_query("DELETE FROM {spam_tracker} WHERE id = %d AND source = 'trackback'", $trackback->trid);
     spam_log(SPAM_LOG, t('spam_delete_trackback: deleted trackback "%subject".', array('%subject' => "<em>$trackback->subject</em>")), 'trackback', $trackback->trid);
   }
-  watchdog('spam', t('Deleted trackback <em>%subject</em>.  The trackback was posted to %link.', array('%subject' => "$trackback->subject", '%link' => l(url('node/'. $trackback->nid, NULL, NULL, TRUE), url('node/'. $trackback->nid)))));
+  watchdog('trackback', t('Deleted trackback <em>%subject</em>.  The trackback was posted to %link.', array('%subject' => "$trackback->subject", '%link' => l(url('node/'. $trackback->nid, NULL, NULL, TRUE), url('node/'. $trackback->nid)))));
 }
 
 function trackback_admin_edit() {
@@ -758,12 +754,7 @@ function trackback_spam_admin_overview($
     $operations['spam_notspam_trackback'] = t('Mark the selected trackbacks as not spam');
   }
   $operations['spam_publish_trackback'] = t('Publish the selected trackbacks');
-  if (module_exist('spam')) {
-    $operations['spam_delete_trackback'] = t('Delete the selected trackbacks (no confirmation)');
-  }
-  else {
-    $operations['trackback_delete'] = t('Delete the selected trackbacks (no confirmation)');
-  }
+  $operations['spam_delete_trackback'] = t('Delete the selected trackbacks (no confirmation)');
 
   if ($op = $_POST['op']) {
     $edit = $_POST['edit'];
@@ -941,11 +932,9 @@ function spam_unpublish_trackback($trid)
 }
 
 function spam_delete_trackback($trid) {
-  $trackback = trackback_load($trid);
-  db_query('DELETE FROM {trackback_received} WHERE trid = %d', $trackback->trid);
-  db_query("DELETE FROM {spam_tracker} WHERE id = %d AND source = 'trackback'", $trackback->trid);
-  watchdog('spam', t('Spam: deleted trackback <em>%subject</em>.  The trackback spam was posted to %link.', array('%subject' => "$trackback->subject", '%link' => l(url('node/'. $trackback->nid, NULL, NULL, TRUE), url('node/'. $trackback->nid)))));
-  spam_log(SPAM_LOG, t('spam_delete_trackback: deleted trackback "%subject".', array('%subject' => "<em>$trackback->subject</em>")), 'trackback', $trackback->trid);
+  if ($trackback = trackback_load($trid)) {
+    trackback_delete($trackback);
+  }
 }
 
 function spam_notspam_trackback($trid) {