makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2023-04-11 21:17:41 +02:00
commit db93cfba0e
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_profile.php
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(); $sql_ary['user_passchg'] = time();

2
phpBB/phpbb/ucp/controller/reset_password.php
View file

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