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	9 Aug 2006 21:44:44 -0000
@@ -17,17 +17,13 @@ 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");
-  }
-  else {
-    $result = db_query("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s'", $key);
-  }
-
   // Build $user object:
-  $user = db_fetch_object($result);
+  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'];
+  }
+  // This is done to unserialize the data member of $user
   $user = drupal_unpack($user);
 
   // Add roles element to $user:
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.650
diff -u -F^f -r1.650 user.module
--- modules/user/user.module	7 Aug 2006 15:04:16 -0000	1.650
+++ modules/user/user.module	9 Aug 2006 21:44:46 -0000
@@ -48,6 +48,17 @@ function user_load($array = array()) {
   $params = array();
 
   foreach ($array as $key => $value) {
+
+    // don't go to the database if loading an anonymous user
+    if ($key == 'uid' && $value == '0') {
+      $user = new stdClass();
+      $user->uid = 0;
+      $user->hostname = $_SERVER['REMOTE_ADDR'];
+      $user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
+      user_module_invoke('load', $array, $user);
+      return $user;
+    }
+
     if ($key == 'uid' || $key == 'status') {
       $query[] = "$key = %d";
       $params[] = $value;