Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1263
diff -u -p -r1.1263 node.module
--- modules/node/node.module	20 Apr 2010 09:30:21 -0000	1.1263
+++ modules/node/node.module	22 Apr 2010 07:47:00 -0000
@@ -2510,13 +2510,14 @@ function node_page_default() {
  * Menu callback; view a single node.
  */
 function node_page_view($node) {
-  drupal_set_title($node->title);
   $uri = entity_uri('node', $node);
   // Set the node path as the canonical URL to prevent duplicate content.
   drupal_add_html_head_link(array('rel' => 'canonical', 'href' => url($uri['path'], $uri['options'])), TRUE);
   // Set the non-aliased path as a default shortlink.
   drupal_add_html_head_link(array('rel' => 'shortlink', 'href' => url($uri['path'], array_merge($uri['options'], array('alias' => TRUE)))), TRUE);
-  return node_show($node);
+  $return = node_show($node);
+  drupal_set_title($node->title);
+  return $return;
 }
 
 /**