diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-12-04 10:41:20 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-12-04 10:41:20 +0000 |
| commit | ab1d68d166ca57e6a0c0de6d940dd395826e37f4 (patch) | |
| tree | 6936670ed8ea4861f1038ca3320c854eb0e17bad /modules/user | |
| parent | 47f527fbbeb4b631bcdf26ce0e74538c8fc96a11 (diff) | |
| download | brdo-ab1d68d166ca57e6a0c0de6d940dd395826e37f4.tar.gz brdo-ab1d68d166ca57e6a0c0de6d940dd395826e37f4.tar.bz2 | |
- Patch #90612 by Bart Jansens: user_logout should only end the current session.
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.module | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 3e81adbb7..30abd234f 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -148,7 +148,7 @@ function user_save($account, $array = array(), $category = 'account') { // Delete a blocked user's sessions to kick them if they are online. if (isset($array['status']) && $array['status'] == 0) { - sess_destroy($account->uid); + sess_destroy_uid($account->uid); } // Refresh user object @@ -1014,7 +1014,7 @@ function user_logout() { watchdog('user', t('Session closed for %name.', array('%name' => $user->name))); // Destroy the current session: - sess_destroy($user->uid); + session_destroy(); module_invoke_all('user', 'logout', NULL, $user); // Load the anonymous user @@ -1444,7 +1444,7 @@ function user_confirm_delete($name, $uid) { */ function user_delete($edit, $uid) { $account = user_load(array('uid' => $uid)); - sess_destroy($uid); + sess_destroy_uid($uid); db_query('DELETE FROM {users} WHERE uid = %d', $uid); db_query('DELETE FROM {users_roles} WHERE uid = %d', $uid); db_query('DELETE FROM {authmap} WHERE uid = %d', $uid); |