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

[ticket/14660] Fix parsing board email messages through template engine.

Browse source 
PHPBB3-14660
This commit is contained in:
rxu 2016-06-18 00:26:54 +07:00
parent 6a73188e6a
commit 9551475fce
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/acp/acp_board.php
View file

@ -642,6 +642,9 @@ class acp_board
$messenger->template('test'); $messenger->template('test');
$messenger->set_addresses($user->data); $messenger->set_addresses($user->data);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user->data['username']),
));
$messenger->send(NOTIFY_EMAIL); $messenger->send(NOTIFY_EMAIL);
trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action)); trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action));

29
phpBB/includes/functions_messenger.php
View file

@ -624,31 +624,34 @@ class messenger
*/ */
protected function setup_template() protected function setup_template()
{ {
global $phpbb_extension_manager, $phpbb_container, $phpbb_filesystem; global $phpbb_container;
if ($this->template instanceof \phpbb\template\template) if ($this->template instanceof \phpbb\template\template)
{ {
return; return;
} }
$template_environment = new \phpbb\template\twig\environment(
$phpbb_container->get('config'),
$phpbb_container->get('filesystem'),
$phpbb_container->get('path_helper'),
$phpbb_container->getParameter('core.template.cache_path'),
$phpbb_container->get('ext.manager'),
new \phpbb\template\twig\loader(
$phpbb_container->get('filesystem')
)
);
$template_environment->setLexer($phpbb_container->get('template.twig.lexer'));
$this->template = new \phpbb\template\twig\twig( $this->template = new \phpbb\template\twig\twig(
$phpbb_container->get('path_helper'), $phpbb_container->get('path_helper'),
$phpbb_container->get('config'), $phpbb_container->get('config'),
new \phpbb\template\context(), new \phpbb\template\context(),
new \phpbb\template\twig\environment( $template_environment,
$phpbb_container->get('config'), $phpbb_container->getParameter('core.template.cache_path'),
$phpbb_container->get('filesystem'),
$phpbb_container->get('path_helper'),
$phpbb_container->getParameter('core.cache_dir'),
$phpbb_container->get('ext.manager'),
new \phpbb\template\twig\loader(
$phpbb_filesystem
)
),
$phpbb_container->getParameter('core.cache_dir'),
$phpbb_container->get('user'), $phpbb_container->get('user'),
$phpbb_container->get('template.twig.extensions.collection'), $phpbb_container->get('template.twig.extensions.collection'),
$phpbb_extension_manager $phpbb_container->get('ext.manager')
); );
} }