--- trackback.module_080410	Thu Apr 10 02:04:18 2008
+++ trackback.module	Tue Feb 17 13:43:00 2009
@@ -180,7 +180,8 @@ function trackback_trackback(&$trackback
 
     case 'delete':
       if (module_exists('spam')) {
-        db_query("DELETE FROM {spam_tracker} WHERE source='trackback' AND id=%d", $trackback->trid);
+// id to sid
+        db_query("DELETE FROM {spam_tracker} WHERE source='trackback' AND sid=%d", $trackback->trid);
         spam_log(SPAM_LOG, t('spam_delete_trackback: deleted trackback "%subject".', array('%subject' => $trackback->subject)), 'trackback', $trackback->trid);
       }
       break;
@@ -354,7 +355,8 @@ function trackback_nodeapi(&$node, $op, 
 
     case 'delete':
       if (module_exists('spam')) {
-        db_query("DELETE FROM {spam_tracker} USING ({spam_tracker}, {trackback_received}) WHERE {spam_tracker}.source='trackback' AND {spam_tracker}.id={trackback_received}.trid AND {trackback_received}.nid=%d", $node->nid);
+//id to sid
+        db_query("DELETE FROM {spam_tracker} USING ({spam_tracker}, {trackback_received}) WHERE {spam_tracker}.source='trackback' AND {spam_tracker}.sid={trackback_received}.trid AND {trackback_received}.nid=%d", $node->nid);
       }
       db_query("DELETE FROM {trackback_node} WHERE nid=%d", $node->nid);
       db_query("DELETE FROM {trackback_sent} WHERE nid=%d", $node->nid);
@@ -571,7 +573,8 @@ function trackback_admin_overview($type 
   $status = ($type == 'approval') ? 0 : 1;
   if ($spam_module_exists) {
     $spam_threshold = (int)variable_get('spam_threshold', 80);
-    $sql = 'SELECT tr.*, s.probability FROM {trackback_received} tr LEFT JOIN {spam_tracker} s ON s.source = \'trackback\' AND tr.trid = s.id WHERE '. ($type == 'spam' ? 's.probability >= '. $spam_threshold : 'tr.status = '. $status);
+        // s.probability to s.score, s.id to s.sid
+    $sql = 'SELECT tr.*, s.score FROM {trackback_received} tr LEFT JOIN {spam_tracker} s ON s.source = \'trackback\' AND tr.trid = s.sid WHERE '. ($type == 'spam' ? 's.score >= '. $spam_threshold : 'tr.status = '. $status);
   }
   else {
     $sql = 'SELECT tr.* FROM {trackback_received} tr WHERE tr.status = '. $status;
@@ -634,7 +637,8 @@ function trackback_admin_table_header($t
       $header[] = array('data' => t('Status'), 'field' => 'tr.status');
     }
     else {
-      $header[] = array('data' => t('Spam'), 'field' => 's.probability');
+    // s.probability to s.score
+      $header[] = array('data' => t('Spam'), 'field' => 's.score');
     }
   }
   $header[] = array('data' => t('Time'), 'field' => 'created', 'sort' => 'desc');
@@ -902,8 +906,8 @@ function trackback_spam_link($trackback)
   if (!variable_get('trackback_spam_filter', 1)) {
     return $output;
   }
-
-  $p = db_fetch_object(db_query("SELECT probability FROM {spam_tracker} WHERE id = %d AND source = 'trackback'", $trackback->trid));
+    // probability to score, id to sid
+  $p = db_fetch_object(db_query("SELECT score FROM {spam_tracker} WHERE sid = %d AND source = 'trackback'", $trackback->trid));
   $spam = array(
     'href' => 'spam/trackback/'. $trackback->trid .'/spam',
     'title' => t('mark as spam')
@@ -1045,7 +1049,8 @@ function _trackback_spam_modify($tb, $sp
   spam_tokens_unsave($tokens, $spam);
   spam_tokens_save($tokens, $spam);
   $prob = $spam ? 99 : 1;
-  db_query("UPDATE {spam_tracker} SET probability=%d, timestamp=%d WHERE source='trackback' AND id=%d", $prob, time(), $tb->trid);
+      // probability to score, id to sid
+  db_query("UPDATE {spam_tracker} SET score=%d, timestamp=%d WHERE source='trackback' AND sid=%d", $prob, time(), $tb->trid);
   spam_default_actions('trackback', $tb->trid, $tb->subject, $tb->excerpt, $prob, NULL, FALSE);
 }