Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.916
diff -u -p -r1.916 node.module
--- modules/node/node.module	6 Dec 2007 09:58:32 -0000	1.916
+++ modules/node/node.module	7 Dec 2007 02:32:40 -0000
@@ -686,11 +686,9 @@ function node_load($param = array(), $re
 
   // Retrieve a field list based on the site's schema.
   $fields = drupal_schema_fields_sql('node', 'n');
-  $fields = array_merge($fields, drupal_schema_fields_sql('node_revisions', 'r'));
-  $fields = array_merge($fields, array('u.name', 'u.picture', 'u.data'));
+  $fields = array_merge($fields, array('r.nid', 'r.vid', 'r.title', 'r.body', 'r.teaser', 'r.log', 'r.timestamp AS revision_timestamp', 'r.format'));
+  $fields = array_merge($fields, array('u.name', 'u.picture', 'u.data', 'u.uid'));
   $fields = implode(', ', $fields);
-  // rename timestamp field for clarity.
-  $fields = str_replace('r.timestamp', 'r.timestamp AS revision_timestamp', $fields);
 
   // Retrieve the node.
   // No db_rewrite_sql is applied so as to get complete indexing for search.