aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-11-25 11:10:22 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-11-25 11:10:22 +0100
commit2eb2c69db99d93c2c014afaf28ae56a73a66840d (patch)
tree71c8358541238ed6f630f289699bff99c690406a
parent5179e4f93fb372a97a1e71f086c162310edd1b36 (diff)
parent79e66360926bd216b8b07479851f6cf811915541 (diff)
downloadforums-2eb2c69db99d93c2c014afaf28ae56a73a66840d.tar
forums-2eb2c69db99d93c2c014afaf28ae56a73a66840d.tar.gz
forums-2eb2c69db99d93c2c014afaf28ae56a73a66840d.tar.bz2
forums-2eb2c69db99d93c2c014afaf28ae56a73a66840d.tar.xz
forums-2eb2c69db99d93c2c014afaf28ae56a73a66840d.zip
Merge pull request #5454 from rxu/ticket/15881
[ticket/15881] Reset login keys for new password activation
-rw-r--r--phpBB/includes/ucp/ucp_activate.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 1e54c18dc1..7a90f2e3b1 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -87,6 +87,8 @@ class ucp_activate
WHERE user_id = ' . $user_row['user_id'];
$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(
'reportee_id' => $user_row['user_id'],
$user_row['username']