Index: node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.947
diff -u -r1.947 node.module
--- node.module	3 Feb 2008 19:41:47 -0000	1.947
+++ node.module	12 Feb 2008 17:09:34 -0000
@@ -1,4 +1,4 @@
-<?php
+<?php
 // $Id: node.module,v 1.947 2008/02/03 19:41:47 goba Exp $
 
 /**
@@ -1070,6 +1070,10 @@
     $node->build_mode = NODE_BUILD_NORMAL;
   }
 
+  $has_body = db_result(db_query("SELECT has_body FROM {node_type} WHERE type = '%s'", $node->type));
+  if (!$has_body)
+    unset($node->body);
+
   // Remove the delimiter (if any) that separates the teaser from the body.
   $node->body = isset($node->body) ? str_replace('<!--break-->', '', $node->body) : '';