Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.947.2.11
diff -u -p -r1.947.2.11 node.module
--- modules/node/node.module	25 Jun 2008 08:59:57 -0000	1.947.2.11
+++ modules/node/node.module	30 Oct 2008 00:13:32 -0000
@@ -218,8 +218,9 @@ function node_teaser_js(&$form, &$form_s
   if (isset($form['#post']['teaser_js'])) {
     // Glue the teaser to the body.
     if (trim($form_state['values']['teaser_js'])) {
-      // Space the teaser from the body
-      $body = trim($form_state['values']['teaser_js']) ."\r\n<!--break-->\r\n". trim($form_state['values']['body']);
+      // Space the teaser from the body, if there was input in the body.
+      $body_field = trim($form_state['values']['body']);
+      $body = trim($form_state['values']['teaser_js']) . (empty($body_field) ? '<!--break-->' : "\r\n<!--break-->\r\n". $body_field);
     }
     else {
       // Empty teaser, no spaces.