diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-07-22 21:31:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-07-22 21:31:57 +0200 |
| commit | b2c5f8fb4816a5b35984b32d223b8d1aa3a75b6d (patch) | |
| tree | b26c15b0261d7a51fe2aa05fab66782014ae706e /phpBB/includes/ucp | |
| parent | 01018630c96db78afb8e494acaa155f6c714d422 (diff) | |
| parent | d738397e6f6ecb7be1a81c11e69568d6854f78e9 (diff) | |
| download | forums-b2c5f8fb4816a5b35984b32d223b8d1aa3a75b6d.tar forums-b2c5f8fb4816a5b35984b32d223b8d1aa3a75b6d.tar.gz forums-b2c5f8fb4816a5b35984b32d223b8d1aa3a75b6d.tar.bz2 forums-b2c5f8fb4816a5b35984b32d223b8d1aa3a75b6d.tar.xz forums-b2c5f8fb4816a5b35984b32d223b8d1aa3a75b6d.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 9a1284083f..36ab3d0463 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -133,7 +133,6 @@ class ucp_profile 'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'], 'user_email_hash' => ($auth->acl_get('u_chgemail')) ? phpbb_email_hash($data['email']) : $user->data['user_email_hash'], 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? $passwords_manager->hash($data['new_password']) : $user->data['user_password'], - 'user_passchg' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0, ); if ($auth->acl_get('u_chgname') && $config['allow_namechange'] && $data['username'] != $user->data['username']) @@ -147,6 +146,8 @@ class ucp_profile if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !$passwords_manager->check($data['new_password'], $user->data['user_password'])) { + $sql_ary['user_passchg'] = time(); + $user->reset_login_keys(); $phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_NEW_PASSWORD', false, array( 'reportee_id' => $user->data['user_id'], |