#564642: node_build_content() needs to be made reentrant.

From: Damien Tournoud <damien@tournoud.net>


---
 node/node.module |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git modules/node/node.module modules/node/node.module
index 171b2e9..5fe1097 100644
--- modules/node/node.module
+++ modules/node/node.module
@@ -1180,6 +1180,9 @@ function node_build($node, $build_mode = 'full') {
  *
  */
 function node_build_content($node, $build_mode = 'full') {
+  // Remove previously built content, if exists.
+  $node->content = array();
+
   // The 'view' hook can be implemented to overwrite the default function
   // to display nodes.
   if (node_hook($node, 'view')) {
@@ -1187,9 +1190,6 @@ function node_build_content($node, $build_mode = 'full') {
   }
 
   // Build fields content.
-  if (empty($node->content)) {
-    $node->content = array();
-  };
   $node->content += field_attach_view('node', $node, $build_mode);
 
   // Always display a read more link on teasers because we have no way