diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-27 22:52:00 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-27 22:52:00 +0000 |
| commit | 89b0a0a90e06bf02098572cc4cbed28df202a4ae (patch) | |
| tree | f4df64d1f462488dfdf49db375ab0e0144fad865 /modules | |
| parent | cdb6aa723baff615182b5e36f240d2ce28dd1ce5 (diff) | |
| download | brdo-89b0a0a90e06bf02098572cc4cbed28df202a4ae.tar.gz brdo-89b0a0a90e06bf02098572cc4cbed28df202a4ae.tar.bz2 | |
- #10398: User role settings corrupt after requesting new password.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/user.module b/modules/user.module index 69fdadf14..abf9a9aa4 100644 --- a/modules/user.module +++ b/modules/user.module @@ -884,7 +884,7 @@ function user_pass($edit = array()) { $pass = user_password(); // Save new password: - user_save($account, array_merge(object2array($account), array('pass' => $pass))); + user_save($account, array('pass' => $pass)); // Mail new password: $variables = array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal'), '%password' => $pass, '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $account->mail, '%date' => format_date(time()), '%login_uri' => url('user/login', NULL, NULL, TRUE), '%edit_uri' => url('user/edit', NULL, NULL, TRUE)); diff --git a/modules/user/user.module b/modules/user/user.module index 69fdadf14..abf9a9aa4 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -884,7 +884,7 @@ function user_pass($edit = array()) { $pass = user_password(); // Save new password: - user_save($account, array_merge(object2array($account), array('pass' => $pass))); + user_save($account, array('pass' => $pass)); // Mail new password: $variables = array('%username' => $account->name, '%site' => variable_get('site_name', 'drupal'), '%password' => $pass, '%uri' => $base_url, '%uri_brief' => substr($base_url, strlen('http://')), '%mailto' => $account->mail, '%date' => format_date(time()), '%login_uri' => url('user/login', NULL, NULL, TRUE), '%edit_uri' => url('user/edit', NULL, NULL, TRUE)); |