From 7f6ecbec0e9b03581b5bb8cd3bd8207cde4ea910 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 22 Aug 2003 05:00:43 +0000
Subject: - Fixed bug with user sessions.  Patch by Jeremy.

---
 modules/user/user.module | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'modules/user')

diff --git a/modules/user/user.module b/modules/user/user.module
index cae3014fc..ca65a9062 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -25,6 +25,13 @@ function sess_read($key) {
 
   $result = db_query_range("SELECT u.*, s.*, r.name AS role FROM {users} u INNER JOIN {role} r ON u.rid = r.rid INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '". check_query($key) ."' AND u.status < 3", 0, 1);
   $user = db_fetch_object($result);
+  if ($user->data && $data = unserialize($user->data)) {
+    foreach ($data as $key => $value) {
+      if (!isset($user->$key)) {
+        $user->$key = $value;
+      }
+    }
+  }
 
   return !empty($user->session) ? $user->session : '';
 }
-- 
cgit v1.2.3