4 files changed, 12 insertions, 4 deletions
diff --git a/modules/book.module b/modules/book.module
index d099993ee..2f3392738 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -452,8 +452,10 @@ function book_content($node, $teaser = FALSE) {
 
     ob_start();
     eval($node->body);
-    $node->teaser = $node->body = ob_get_contents();
+    $node->body = ob_get_contents();
     ob_end_clean();
+    $node->teaser = node_teaser($node->body);
+    $node->readmore = (strlen($node->teaser) < strlen($node->body));
   }
   else {
     $node = node_prepare($node, $teaser);
diff --git a/modules/book/book.module b/modules/book/book.module
index d099993ee..2f3392738 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -452,8 +452,10 @@ function book_content($node, $teaser = FALSE) {
 
     ob_start();
     eval($node->body);
-    $node->teaser = $node->body = ob_get_contents();
+    $node->body = ob_get_contents();
     ob_end_clean();
+    $node->teaser = node_teaser($node->body);
+    $node->readmore = (strlen($node->teaser) < strlen($node->body));
   }
   else {
     $node = node_prepare($node, $teaser);
diff --git a/modules/page.module b/modules/page.module
index 7babfbcf5..a30224e70 100644
--- a/modules/page.module
+++ b/modules/page.module
@@ -106,8 +106,10 @@ function page_content($node, $teaser = FALSE) {
     // PHP type
     ob_start();
     eval($node->body);
-    $node->teaser = $node->body = ob_get_contents();
+    $node->body = ob_get_contents();
     ob_end_clean();
+    $node->teaser = node_teaser($node->body);
+    $node->readmore = (strlen($node->teaser) < strlen($node->body));
   }
   else {
     // Assume HTML type by default
diff --git a/modules/page/page.module b/modules/page/page.module
index 7babfbcf5..a30224e70 100644
--- a/modules/page/page.module
+++ b/modules/page/page.module
@@ -106,8 +106,10 @@ function page_content($node, $teaser = FALSE) {
     // PHP type
     ob_start();
     eval($node->body);
-    $node->teaser = $node->body = ob_get_contents();
+    $node->body = ob_get_contents();
     ob_end_clean();
+    $node->teaser = node_teaser($node->body);
+    $node->readmore = (strlen($node->teaser) < strlen($node->body));
   }
   else {
     // Assume HTML type by default