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 23:41:33 -0000
@@ -1070,6 +1070,13 @@
     $node->build_mode = NODE_BUILD_NORMAL;
   }
 
+  // The body should not display if has_body isn't set.
+  $type = node_get_types('type', $node);
+  if (!$type->has_body) {
+    unset($node->body);
+    unset($node->teaser);
+  }
+
   // Remove the delimiter (if any) that separates the teaser from the body.
   $node->body = isset($node->body) ? str_replace('<!--break-->', '', $node->body) : '';