- Applied patch #4949: node_prepare() wastes resources. Patch by Goba.

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 3e14c4d16..2b25cc950 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -411,18 +411,16 @@ function node_view($node, $main = 0, $page = 0) {
     ** Default behavior:
     */
 
-    return theme("node", node_prepare($node), $main, $page);
+    return theme("node", node_prepare($node, $main), $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);
+function node_prepare($node, $main = 0) {
+  if ($main == 0) {
+    $node->body = check_output($node->body);
   }
   else {
     $node->teaser = check_output($node->teaser);
-    $node->body = check_output($node->body);
   }
   return $node;
 }