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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2020-04-08 21:39:38 +02:00
parent edd9633565 8566f81d4f
commit c0a95e8e25
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_board.php
View File

@@ -648,6 +648,7 @@ class acp_board
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);
$messenger->assign_vars(array( $messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user->data['username']), 'USERNAME' => htmlspecialchars_decode($user->data['username']),
'MESSAGE' => htmlspecialchars_decode($request->variable('send_test_email_text', '', true)),
)); ));
$messenger->send(NOTIFY_EMAIL); $messenger->send(NOTIFY_EMAIL);
@@ -1167,6 +1168,7 @@ class acp_board
{ {
global $user; global $user;
return '<input class="button2" type="submit" id="' . $key . '" name="' . $key . '" value="' . $user->lang['SEND_TEST_EMAIL'] . '" />'; return '<input class="button2" type="submit" id="' . $key . '" name="' . $key . '" value="' . $user->lang('SEND_TEST_EMAIL') . '" />
<textarea id="' . $key . '_text" name="' . $key . '_text" placeholder="' . $user->lang('MESSAGE') . '"></textarea>';
} }
} }

4
phpBB/language/en/email/test.txt
View File

@@ -4,6 +4,10 @@ Hello {USERNAME},
Congratulations. If you received this email, phpBB is correctly configured to send emails. Congratulations. If you received this email, phpBB is correctly configured to send emails.
<!-- IF MESSAGE -->
{MESSAGE}
<!-- ENDIF -->
In case you require assistance, please visit the phpBB support forums - https://www.phpbb.com/community/ In case you require assistance, please visit the phpBB support forums - https://www.phpbb.com/community/
{EMAIL_SIG} {EMAIL_SIG}