Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1254
diff -u -p -r1.1254 node.module
--- modules/node/node.module	2 Apr 2010 13:54:40 -0000	1.1254
+++ modules/node/node.module	4 Apr 2010 21:42:37 -0000
@@ -1877,6 +1877,8 @@ function node_menu() {
     );
   }
   $items['node/%node'] = array(
+    'title callback' => 'node_page_title',
+    'title arguments' => array(1),
     'page callback' => 'node_page_view',
     'page arguments' => array(1),
     'access callback' => 'node_access',
@@ -1981,7 +1983,8 @@ function node_type_page_title($type) {
  * Title callback.
  */
 function node_page_title($node) {
-  return $node->title;
+  // node titles can be different from menu titles, so setting explicitly
+  return drupal_set_title($node->title);
 }
 
 /**
@@ -2499,7 +2502,6 @@ function node_page_default() {
  * Menu callback; view a single node.
  */
 function node_page_view($node) {
-  drupal_set_title($node->title);
   // Set the node path as the canonical URL to prevent duplicate content.
   drupal_add_html_head_link(array('rel' => 'canonical', 'href' => url('node/' . $node->nid)), TRUE);
   // Set the non-aliased path as a default shortlink.