From 51cf18e53176244f264c56cab1c4ff0d1767ac59 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Sun, 22 Aug 2004 17:03:42 +0000
Subject: - #9292: Make Drupal (somewhat) PHP5 compatible. xtemplate is still
 horribly broken.

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

(limited to 'modules/user.module')

diff --git a/modules/user.module b/modules/user.module
index 915d3414f..bb77c128f 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -54,14 +54,19 @@ function user_load($array = array()) {
   }
   $result = db_query_range("SELECT u.* FROM {users} u WHERE $query u.status < 3", 0, 1);
 
-  $user = db_fetch_object($result);
-  $user = drupal_unpack($user);
-  user_module_invoke('load', $array, $user);
+  if (db_num_rows($result)) {
+    $user = db_fetch_object($result);
+    $user = drupal_unpack($user);
+    user_module_invoke('load', $array, $user);
 
-  $user->roles = array();
-  $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;
+    $user->roles = array();
+    $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 = new StdClass();
   }
 
   return $user;
-- 
cgit v1.2.3