Index: trackback.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/trackback/trackback.module,v
retrieving revision 1.64.2.10
diff -u -r1.64.2.10 trackback.module
--- trackback.module	21 May 2007 17:18:26 -0000	1.64.2.10
+++ trackback.module	27 Jun 2007 22:42:58 -0000
@@ -243,7 +243,7 @@
       }
       break;
 
-    case 'alter':
+    case 'view':
       if ($node->can_receive && !$node->in_preview) {
         $url = url('node/'. $node->nid, NULL, NULL, TRUE);
         $tb_url = url('trackback/'. $node->nid, NULL, NULL, TRUE);
@@ -252,20 +252,21 @@
         $autodetect_comments .= "<rdf:Description rdf:about=\"$url\" dc:identifier=\"$url\" dc:title=\"$node->title\" trackback:ping=\"$tb_url\" />\n";
         $autodetect_comments .= "</rdf:RDF>\n";
         $autodetect_comments .= "-->\n";
-        if ($teaser) {
-          $node->teaser .= $autodetect_comments;
-        }
-        else {
-          $node->body .= $autodetect_comments;
-          $node->body .= theme('box', t('Trackback URL for this post:'), url('trackback/'. $node->nid, NULL, NULL, TRUE));
+        $elements = array (
+          '#weight' => 12,
+          'autodetect' => array('#weight' => 1, '#value' => $autodetect_comments),
+        );
+        if (!$teaser) {
+          $elements['url'] = array('#weight' => 2, '#value' => theme('box', t('Trackback URL for this post:'), url('trackback/'. $node->nid, NULL, NULL, TRUE)) );
           if ($node->trackbacks_received) {
             $link = (user_access('administer trackbacks') || node_access('update', $node));
             foreach ($node->trackbacks_received as $tb) {
               $trackbacks .= theme('trackback', $tb, $link ? _trackback_links($tb) : array());
             }
-            $node->body .= theme('trackbacks', $trackbacks);
+            $elements['received'] = array('#weight' => 3, '#value' => theme('trackbacks', $trackbacks) );
           }
         }
+        $node->content['trackback'] = $elements;
       }
       break;