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 20:53:47 -0000
@@ -688,9 +688,13 @@ function node_load($param = array(), $re
   $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'));
+  // Remove conflicts between node and node_revisions fields.
+  $fields = array_diff($fields, array('n.vid', 'n.title', 'r.nid'));
   $fields = implode(', ', $fields);
-  // rename timestamp field for clarity.
+  // Rename timestamp field for clarity.
   $fields = str_replace('r.timestamp', 'r.timestamp AS revision_timestamp', $fields);
+  // Change name of revision uid so it doesn't conflict with n.uid.
+  $fields = str_replace('r.uid', 'r.uid AS revision_uid', $fields);
 
   // Retrieve the node.
   // No db_rewrite_sql is applied so as to get complete indexing for search.