- Patch 4916: improved preparation of $node->teaser and $node->body.  Patch by
  Goba.

modules/blog.module

@@ -220,9 +220,7 @@ function blog_page() {
 }
 
 function blog_content($node) {
-  $node->teaser = check_output($node->teaser);
-  $node->body = check_output($node->body);
-  return $node;
+  return node_prepare($node);
 }
 
 function blog_view($node, $main = 0, $page = 0) {

modules/blog/blog.module

@@ -220,9 +220,7 @@ function blog_page() {
 }
 
 function blog_content($node) {
-  $node->teaser = check_output($node->teaser);
-  $node->body = check_output($node->body);
-  return $node;
+  return node_prepare($node);
 }
 
 function blog_view($node, $main = 0, $page = 0) {

modules/book.module

@@ -376,8 +376,7 @@ function book_content($node) {
     ob_end_clean();
   }
   else {
-    $node->teaser = check_output($node->teaser);
-    $node->body = check_output($node->body);
+    $node = node_prepare($node);
   }
 
   return $node;

modules/book/book.module

@@ -376,8 +376,7 @@ function book_content($node) {
     ob_end_clean();
   }
   else {
-    $node->teaser = check_output($node->teaser);
-    $node->body = check_output($node->body);
+    $node = node_prepare($node);
   }
 
   return $node;

modules/forum.module

@@ -141,9 +141,7 @@ function forum_link($type, $node = 0, $main = 0) {
 }
 
 function forum_content($node) {
-  $node->teaser = check_output($node->teaser);
-  $node->body = check_output($node->body);
-  return $node;
+  return node_prepare($node);
 }
 
 function forum_view($node, $main = 0, $page = 0) {

modules/forum/forum.module

@@ -141,9 +141,7 @@ function forum_link($type, $node = 0, $main = 0) {
 }
 
 function forum_content($node) {
-  $node->teaser = check_output($node->teaser);
-  $node->body = check_output($node->body);
-  return $node;
+  return node_prepare($node);
 }
 
 function forum_view($node, $main = 0, $page = 0) {

modules/node.module

@@ -411,17 +411,20 @@ function node_view($node, $main = 0, $page = 0) {
     ** Default behavior:
     */
 
-    if ($node->teaser == $node->body) {
-      // Only invoke check_output() once for performance's sake:
-      $node->teaser = $node->body = check_output($node->teaser);
-    }
-    else {
-      $node->teaser = check_output($node->teaser);
-      $node->body = check_output($node->body);
-    }
+    return theme("node", node_prepare($node), $main, $page);
+  }
+}
 
-    return theme("node", $node, $main, $page);
+function node_prepare($node) {
+  if ($node->teaser == $node->body) {
+    // Only invoke check_output() once for performance's sake:
+    $node->teaser = $node->body = check_output($node->teaser);
+  }
+  else {
+    $node->teaser = check_output($node->teaser);
+    $node->body = check_output($node->body);
   }
+  return $node;
 }
 
 function node_show($node, $cid) {

modules/node/node.module

@@ -411,17 +411,20 @@ function node_view($node, $main = 0, $page = 0) {
     ** Default behavior:
     */
 
-    if ($node->teaser == $node->body) {
-      // Only invoke check_output() once for performance's sake:
-      $node->teaser = $node->body = check_output($node->teaser);
-    }
-    else {
-      $node->teaser = check_output($node->teaser);
-      $node->body = check_output($node->body);
-    }
+    return theme("node", node_prepare($node), $main, $page);
+  }
+}
 
-    return theme("node", $node, $main, $page);
+function node_prepare($node) {
+  if ($node->teaser == $node->body) {
+    // Only invoke check_output() once for performance's sake:
+    $node->teaser = $node->body = check_output($node->teaser);
+  }
+  else {
+    $node->teaser = check_output($node->teaser);
+    $node->body = check_output($node->body);
   }
+  return $node;
 }
 
 function node_show($node, $cid) {

modules/page.module

@@ -104,8 +104,7 @@ function page_content($node) {
 
   if ($node->format == 0) {
     // HTML type
-    $node->teaser = check_output($node->teaser);
-    $node->body = check_output($node->body);
+    $node = node_prepare($node);
   }
   else {
     // PHP type

modules/page/page.module

@@ -104,8 +104,7 @@ function page_content($node) {
 
   if ($node->format == 0) {
     // HTML type
-    $node->teaser = check_output($node->teaser);
-    $node->body = check_output($node->body);
+    $node = node_prepare($node);
   }
   else {
     // PHP type

modules/story.module

@@ -91,8 +91,6 @@ function story_form(&$node, &$help, &$error) {
 }
 
 function story_content($node) {
-  $node->teaser = check_output($node->teaser);
-  $node->body = check_output($node->body);
-  return $node;
+  return node_prepare($node);
 }
 ?>

modules/story/story.module

@@ -91,8 +91,6 @@ function story_form(&$node, &$help, &$error) {
 }
 
 function story_content($node) {
-  $node->teaser = check_output($node->teaser);
-  $node->body = check_output($node->body);
-  return $node;
+  return node_prepare($node);
 }
 ?>