Index: 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 16:32:02 -0000
@@ -684,14 +682,10 @@ function node_load($param = array(), $re
     return FALSE;
   }
 
-  // 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 = implode(', ', $fields);
-  // rename timestamp field for clarity.
-  $fields = str_replace('r.timestamp', 'r.timestamp AS revision_timestamp', $fields);
-
+  // Specify the appropriate fields from node, node_revisions, and users tables.
+  
+  $fields = 'n.nid, n.type, n.status, n.created, n.changed, n.comment, n.promote, n.moderate, n.sticky, n.tnid, n.translate, r.vid, r.timestamp AS revision_timestamp, r.uid AS revision_uid, r.title, r.body, r.teaser, r.log, r.format, u.uid, u.name, u.picture, u.data';
+  
   // Retrieve the node.
   // No db_rewrite_sql is applied so as to get complete indexing for search.
   if ($revision) {