1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 12:46:38 +02:00

Merge pull request #6477 from rxu/ticket/17127

[ticket/17127] Do not purge guest sessions when resetting password
This commit is contained in:
Marc Alexander
2023-04-11 21:17:28 +02:00
2 changed files with 2 additions and 2 deletions

View File

@ -143,7 +143,7 @@ class ucp_profile
));
}
if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !$passwords_manager->check($data['new_password'], $user->data['user_password']))
if ($auth->acl_get('u_chgpasswd') && $data['new_password'])
{
$sql_ary['user_passchg'] = time();

View File

@ -415,7 +415,7 @@ class reset_password
SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . (int) $user_row['user_id'];
$this->db->sql_query($sql);
$this->user->reset_login_keys();
$this->user->reset_login_keys($user_row['user_id']);
$this->log->add('user', $user_row['user_id'], $this->user->ip, 'LOG_USER_NEW_PASSWORD', false, [
'reportee_id' => $user_row['user_id'],
$user_row['username']