diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-12-18 21:33:04 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-12-18 21:33:04 +0000 |
| commit | e06cdc577e45b7a0522f4f32ad25b598d19b510e (patch) | |
| tree | ab2f49c3d9d3d16ccac437554da045c90b83eab3 | |
| parent | 23c7a4aa5da9fdd9181d3ce19b2b7bd005d943c7 (diff) | |
| download | brdo-e06cdc577e45b7a0522f4f32ad25b598d19b510e.tar.gz brdo-e06cdc577e45b7a0522f4f32ad25b598d19b510e.tar.bz2 | |
- Fixed bug 4667: users with the deleted role are put back in the authenticated
users pool.
| -rw-r--r-- | modules/user.module | 4 | ||||
| -rw-r--r-- | modules/user/user.module | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/modules/user.module b/modules/user.module index 5652de869..55da4b6b3 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1328,6 +1328,10 @@ function user_admin_role($edit = array()) { else if ($op == t("Delete role")) { db_query("DELETE FROM {role} WHERE rid = %d", $id); db_query("DELETE FROM {permission} WHERE rid = %d", $id); + + // Users with the deleted role are put back in the authenticated users pool + $aid = db_result(db_query("SELECT rid FROM {role} WHERE name = 'Authenticated user'")); + db_query("UPDATE {users} SET rid = %d WHERE rid = %d", $aid, $id); } else if ($op == t("Add role")) { db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit["name"]); diff --git a/modules/user/user.module b/modules/user/user.module index 5652de869..55da4b6b3 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1328,6 +1328,10 @@ function user_admin_role($edit = array()) { else if ($op == t("Delete role")) { db_query("DELETE FROM {role} WHERE rid = %d", $id); db_query("DELETE FROM {permission} WHERE rid = %d", $id); + + // Users with the deleted role are put back in the authenticated users pool + $aid = db_result(db_query("SELECT rid FROM {role} WHERE name = 'Authenticated user'")); + db_query("UPDATE {users} SET rid = %d WHERE rid = %d", $aid, $id); } else if ($op == t("Add role")) { db_query("INSERT INTO {role} (name) VALUES ('%s')", $edit["name"]); |