summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-03-18 06:43:41 +0000
committerDries Buytaert <dries@buytaert.net>2010-03-18 06:43:41 +0000
commit1adb7e97494f4ec509854cc698ccabdddcfe79bd (patch)
tree40f6a80e1c65c8ba8b67158f1301e40166ad18f5 /modules
parent75f279a52a1d8c8950211693ad2a36d2d9664388 (diff)
downloadbrdo-1adb7e97494f4ec509854cc698ccabdddcfe79bd.tar.gz
brdo-1adb7e97494f4ec509854cc698ccabdddcfe79bd.tar.bz2
- Patch #745680 by catch: remove pointless db_delete()('user_roles()') for new users.
Diffstat (limited to 'modules')
-rw-r--r--modules/user/user.module5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 510c9c261..7d56d9bae 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -538,11 +538,8 @@ function user_save($account, $edit = array(), $category = 'account') {
drupal_write_record('users', $data_array, 'uid');
}
- // Save user roles (delete just to be safe).
+ // Save user roles.
if (isset($edit['roles']) && is_array($edit['roles'])) {
- db_delete('users_roles')
- ->condition('uid', $edit['uid'])
- ->execute();
$query = db_insert('users_roles')->fields(array('uid', 'rid'));
foreach (array_keys($edit['roles']) as $rid) {
if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {