Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.947.2.2
diff -u -p -r1.947.2.2 node.module
--- modules/node/node.module	13 Feb 2008 14:10:22 -0000	1.947.2.2
+++ modules/node/node.module	19 Feb 2008 12:53:14 -0000
@@ -1070,6 +1070,13 @@ function node_build_content($node, $teas
     $node->build_mode = NODE_BUILD_NORMAL;
   }
 
+  // Remove the body if the node type should not contain one.
+  $type = node_get_types('type', $node);
+  if (!$type->has_body) {
+    $node->body = '';
+    $node->teaser = '';
+  }
+
   // Remove the delimiter (if any) that separates the teaser from the body.
   $node->body = isset($node->body) ? str_replace('<!--break-->', '', $node->body) : '';