Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.701
diff -u -F^f -r1.701 node.module
--- modules/node/node.module	16 Sep 2006 05:35:57 -0000	1.701
+++ modules/node/node.module	3 Oct 2006 20:20:05 -0000
@@ -665,8 +665,22 @@ function node_view($node, $teaser = FALS
  * Apply filters and build the node's standard elements.
  */
 function node_prepare($node, $teaser = FALSE) {
+  // First we'll overwrite the existing node teaser and body with
+  // the filtered copies. Then, we'll stick those into the content
+  // array and set the read more flag if appropriate.
+  if (strlen($node->teaser) < strlen($node->body)) {
+    $node->readmore = TRUE;
+  }
+  
+  if ($teaser) {
+    $node->teaser = check_markup($node->teaser, $node->format, FALSE);
+  }
+  else {
+    $node->body = check_markup($node->body, $node->format, FALSE);
+  }
+
   $node->content['body'] = array(
-    '#value' => check_markup($teaser ? $node->teaser : $node->body, $node->format, FALSE),
+    '#value' => $teaser ? $node->teaser : $node->body,
     '#weight' => 0,
   );
 
@@ -677,10 +691,6 @@ function node_prepare($node, $teaser = F
     );
   }
 
-  if (strlen($node->teaser) < strlen($node->body)) {
-    $node->readmore = TRUE;
-  }
-
   return $node;
 }