diff --git a/modules/node/node.module b/modules/node/node.module
index 81deae232127cd4f28fb282cad8743e0e5a2f874..bc76dacc7ab85c5b9f487b9c4a144f511d5ef0d9 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -635,6 +635,8 @@ function node_save(&$node) {
 function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
   $node = (object)$node;
 
+  $node = node_build_content($node, $teaser, $page);
+
   if ($links) {
     $node->links = module_invoke_all('link', 'node', $node, !$page);
 
@@ -644,8 +646,6 @@ function node_view($node, $teaser = FALSE, $page = FALSE, $links = TRUE) {
     }
   }
 
-  $node = node_build_content($node, $teaser, $page);
-
   // Set the proper node part, then unset unused $node part so that a bad
   // theme can not open a security hole.
   $content = drupal_render($node->content);