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

  Goba.

1 files changed, 12 insertions, 9 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 9ad158e6b..df8b0ea73 100644
--- a/modules/node/node.module
+++ b/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) {