diff -uN --exclude CVS /home/sugree/work/cvs/drupal/main/atom/atom.info ./atom.info
--- /home/sugree/work/cvs/drupal/main/atom/atom.info	1970-01-01 07:00:00.000000000 +0700
+++ ./atom.info	2007-01-04 00:41:10.000000000 +0700
@@ -0,0 +1,3 @@
+; $Id$
+name = atom
+description = Provides an Atom 1.0 feed
--- /home/sugree/work/cvs/drupal/main/atom/atom.module	2006-08-14 01:18:27.000000000 +0700
+++ atom.module	2007-01-05 23:57:39.000000000 +0700
@@ -138,14 +138,18 @@
     $link = url("node/$node->nid", NULL, NULL, true);
 
     if (node_hook($item, 'view')) {
-      node_invoke($item, 'view', TRUE, FALSE);
+      $item = node_invoke($item, 'view', TRUE, FALSE);
+      $item = node_invoke($item, 'view', FALSE, FALSE);
     }
     else {
       $item = node_prepare($item, TRUE);
+      $item = node_prepare($item, FALSE);
     }
 
     // Allow modules to change $node->teaser before viewing.
     node_invoke_nodeapi($item, 'view', true, false);
+    // Allow modules to change $node->body before viewing.
+    node_invoke_nodeapi($item, 'view', false, false);
 
     $output .= "  <entry>\n";
     $output .= '    <title>'. check_plain(strip_tags($item->title)) ."</title>\n";
@@ -162,7 +166,7 @@
       $output .= '      <name>'. variable_get('anonymous', 'Anonymous') ."</name>\n";
     }
     $output .= "    </author>\n";
-    if (module_exist('taxonomy')) {
+    if (module_exists('taxonomy')) {
       $terms = taxonomy_node_get_terms($item->nid);
       foreach ($terms as $term) {
         $output .= '    <category term="'. check_plain(strip_tags($term->name)) . '" />'. "\n";
@@ -170,13 +174,13 @@
     }
     // Summary
     $output .= '    <summary type="html"><![CDATA[';
-    $output .= check_markup($item->teaser, $item->format, FALSE);
+    $output .= check_markup($item->teaser);
     $output .= "    ]]></summary>\n";
 
     // Body
     $output .= '    <content type="html"><![CDATA[';
     $output .= variable_get('atom_ad_location', 'off') == 'prepend' ? str_replace('%link', urlencode($link), str_replace('%id', $node->nid, variable_get('atom_ad_code', ''))) : '';
-    $output .= check_markup($item->body, $item->format, FALSE);
+    $output .= check_markup($item->body);
     $output .= variable_get('atom_ad_location', 'off') == 'append' ? str_replace('%link', urlencode($link), str_replace('%id', $node->nid, variable_get('atom_ad_code', ''))) : '';
     $output .= "    ]]></content>\n";
     $output .= "  </entry>\n";