Index: includes/session.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/session.inc,v
retrieving revision 1.28
diff -u -F^f -r1.28 session.inc
--- includes/session.inc	7 May 2006 00:08:36 -0000	1.28
+++ includes/session.inc	11 Aug 2006 22:04:01 -0000
@@ -17,32 +17,26 @@ function sess_close() {
 function sess_read($key) {
   global $user;

-  // retrieve data for a $user object
-  $result = db_query("SELECT sid FROM {sessions} WHERE sid = '%s'", $key);
-  if (!db_num_rows($result)) {
-    $result = db_query("SELECT u.* FROM {users} u WHERE u.uid = 0");
+  // Build $user object:
+  if (!$user = db_fetch_object(db_query("SELECT u.*, s.* FROM {sessions} s LEFT JOIN {users} u ON s.uid = u.uid WHERE s.sid = '%s'", $key))) {
+    $user = new stdClass();
+    $user->uid = 0;
+    $user->hostname = $_SERVER['REMOTE_ADDR'];
+    $user->roles = array();
+    $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
   }
   else {
-    $result = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key);
-  }
+    // This is done to unserialize the data member of $user
+    $user = drupal_unpack($user);

-  // Build $user object:
-  $user = db_fetch_object($result);
-  $user = drupal_unpack($user);
-
-  // Add roles element to $user:
-  $user->roles = array();
-  if ($user->uid) {
+    // Add roles element to $user
+    $user->roles = array();
     $user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
-
     $result = db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d", $user->uid);
     while ($role = db_fetch_object($result)) {
       $user->roles[$role->rid] = $role->name;
     }
   }
-  else {
-    $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
-  }

   return !empty($user->session) ? $user->session : '';
 }

Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.651
diff -u -r1.651 user.module
--- user.module 10 Aug 2006 15:42:33 -0000      1.651
+++ user.module 11 Aug 2006 22:02:48 -0000
@@ -47,6 +47,17 @@
   $query = array();
   $params = array();

+  // don't go to the database if loading an anonymous user
+  if (isset($array['uid']) && $array['uid'] == 0) {
+    $user = new stdClass();
+    $user->uid = 0;
+    $user->hostname = $_SERVER['REMOTE_ADDR'];
+    $user->roles = array();
+    $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+    user_module_invoke('load', $array, $user);
+    return $user;
+  }
+
   foreach ($array as $key => $value) {
     if ($key == 'uid' || $key == 'status') {
       $query[] = "$key = %d";