Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1046
diff -u -p -r1.1046 node.module
--- modules/node/node.module	12 May 2009 08:31:17 -0000	1.1046
+++ modules/node/node.module	13 May 2009 09:36:45 -0000
@@ -843,7 +844,6 @@ function node_load_multiple($nids = arra
     else {
       $query->join('node_revision', 'r', 'r.vid = n.vid');
     }
-    $query->join('users', 'u', 'u.uid = n.uid');
 
     // Add fields from the {node} table.
     $node_fields = drupal_schema_fields_sql('node');
@@ -864,10 +864,6 @@ function node_load_multiple($nids = arra
     $query->addField('r', 'timestamp', 'revision_timestamp');
     $query->fields('r', $node_revision_fields);
 
-    // Add fields from the {users} table.
-    $user_fields = array('name', 'picture', 'data');
-    $query->fields('u', $user_fields);
-
     if ($nids) {
       $query->condition('n.nid', $nids, 'IN');
     }
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.985
diff -u -p -r1.985 user.module
--- modules/user/user.module	12 May 2009 09:07:18 -0000	1.985
+++ modules/user/user.module	13 May 2009 09:36:48 -0000
@@ -2672,6 +2672,27 @@ function _user_password_dynamic_validati
 }
 
 /**
+ * Implementation of hook_node_load().
+ */
+function user_node_load($nodes, $types) {
+  // Build an array of all uids for node authors, keyed by nid.
+  $uids = array();
+  foreach ($nodes as $nid => $node) {
+    $uids[$nid] = $node->uid;
+  }
+
+  // Fetch name, picture, and data for these users.
+  $user_fields = db_query("SELECT uid, name, picture, data FROM {users} WHERE uid IN (:uids)", array(':uids' => $uids))->fetchAllAssoc('uid');
+
+  // Add these values back into the node objects.
+  foreach ($uids as $nid => $uid) {
+    $nodes[$nid]->name = $user_fields[$uid]->name;
+    $nodes[$nid]->picture = $user_fields[$uid]->picture;
+    $nodes[$nid]->data = $user_fields[$uid]->data;
+  }
+}
+
+/**
  * Implementation of hook_hook_info().
  */
 function user_hook_info() {