From d0090e69e67cdd213be259281cbb008bca0d4006 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 19 May 2004 14:55:19 +0000
Subject: - Patch #7614 by jhriggs: fixed some role related problems.

---
 modules/user.module | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules/user.module')

diff --git a/modules/user.module b/modules/user.module
index e6b6cd42c..34003c959 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -86,11 +86,13 @@ function user_save($account, $array = array()) {
 
     db_query("UPDATE {users} SET $query changed = %d WHERE uid = %d", array_merge($v, array(time(), $account->uid)));
 
-    // reload user roles
-    db_query("DELETE FROM {users_roles} WHERE uid = %d", $account->uid);
+    // reload user roles if provided
+    if (is_array($array['rid'])) {
+      db_query("DELETE FROM {users_roles} WHERE uid = %d", $account->uid);
 
-    foreach ($array['rid'] as $rid) {
-      db_query("INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)", $account->uid, $rid);
+      foreach ($array['rid'] as $rid) {
+        db_query("INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)", $account->uid, $rid);
+      }
     }
 
     $user = user_load(array('uid' => $account->uid));
-- 
cgit v1.2.3