summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-12-16 21:09:55 +0000
committerDries Buytaert <dries@buytaert.net>2008-12-16 21:09:55 +0000
commit9fe9144ae7804e3b80c0ffd8444b0448261f4436 (patch)
treea5dc7a228e97c33fd0e2daca47d10367228050fc /modules
parent90276160cb9769383a1196b26b9613624744567a (diff)
downloadbrdo-9fe9144ae7804e3b80c0ffd8444b0448261f4436.tar.gz
brdo-9fe9144ae7804e3b80c0ffd8444b0448261f4436.tar.bz2
- Patch #169937 by Heine, drumm: user_save should not regenerate the session even when the current user is not the edited user.
Diffstat (limited to 'modules')
-rw-r--r--modules/user/user.module4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 0ee98a979..464ac755b 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -282,7 +282,9 @@ function user_save($account, $edit = array(), $category = 'account') {
// the current one.
if (!empty($edit['pass'])) {
drupal_session_destroy_uid($account->uid);
- drupal_session_regenerate();
+ if ($account->uid == $GLOBALS['user']->uid) {
+ drupal_session_regenerate();
+ }
}
// Refresh user object.