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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2018-11-25 11:10:28 +01:00
commit 2778c9b76b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_activate.php
View file

@ -87,6 +87,8 @@ class ucp_activate
WHERE user_id = ' . $user_row['user_id']; WHERE user_id = ' . $user_row['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
$user->reset_login_keys($user_row['user_id']);
$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_NEW_PASSWORD', false, array( $phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_NEW_PASSWORD', false, array(
'reportee_id' => $user_row['user_id'], 'reportee_id' => $user_row['user_id'],
$user_row['username'] $user_row['username']