mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/17135] Fix code review issues

Browse Source 
PHPBB-17135
This commit is contained in:
rxu
2024-06-23 13:26:43 +07:00
parent 51fae82718
commit 499464e1d3
24 changed files with 353 additions and 1782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/includes/ucp/ucp_profile.php
View File

@@ -174,17 +174,16 @@ class ucp_profile
$user_actkey = gen_rand_string(mt_rand(6, 10));
$messenger = $phpbb_container->get('messenger.method_collection');
$email = $messenger->offsetGet('messenger.method.email');
$email_method = $phpbb_container->get('messenger.method.email');
$template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate';
$email->template($template_file, $user->data['user_lang']);
$email->to($data['email'], $data['username']);
$email->anti_abuse_headers($config, $user);
$email->assign_vars([
$email_method->template($template_file, $user->data['user_lang']);
$email_method->to($data['email'], $data['username']);
$email_method->anti_abuse_headers($config, $user);
$email_method->assign_vars([
'USERNAME' => html_entity_decode($data['username'], ENT_COMPAT),
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey",
]);
$email->send();
$email_method->send();
if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
{