diff options
| author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-07-18 07:46:30 +0000 |
|---|---|---|
| committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-07-18 07:46:30 +0000 |
| commit | 2ddb81af029f376e136fce7127522a62f0da6b06 (patch) | |
| tree | 3afae7720e2f99c6ff5acd6e101429218e718f44 | |
| parent | a73303a88224246a60e7224fbd805a1893bf8d9a (diff) | |
| download | brdo-2ddb81af029f376e136fce7127522a62f0da6b06.tar.gz brdo-2ddb81af029f376e136fce7127522a62f0da6b06.tar.bz2 | |
#66697 by hunmonk, simplify user role deletion.
| -rw-r--r-- | modules/user/user.module | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index f4b259014..bc73280bc 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1824,18 +1824,8 @@ function user_admin_role() { else if ($op == t('Delete role')) { db_query('DELETE FROM {role} WHERE rid = %d', $id); db_query('DELETE FROM {permission} WHERE rid = %d', $id); - // Update the users who have this role set: - $result = db_query('SELECT DISTINCT(ur1.uid) FROM {users_roles} ur1 LEFT JOIN {users_roles} ur2 ON ur2.uid = ur1.uid WHERE ur1.rid = %d AND ur2.rid != ur1.rid', $id); - $uid = array(); - - while ($u = db_fetch_object($result)) { - $uid[] = $u->uid; - } - - if ($uid) { - db_query('DELETE FROM {users_roles} WHERE rid = %d AND uid IN (%s)', $id, implode(', ', $uid)); - } + db_query('DELETE FROM {users_roles} WHERE rid = %d', $id); drupal_set_message(t('The role has been deleted.')); drupal_goto('admin/access/roles'); |