diff options
| author | rxu <rxu@mail.ru> | 2016-06-18 00:26:54 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2016-06-18 00:39:33 +0700 |
| commit | 9551475fcee77cc559f5b7d0424358d874cdfd9c (patch) | |
| tree | 8352ed69b5c40865532526a291a6b4dca562e105 /phpBB/includes | |
| parent | 6a73188e6a194d268958251c184cd9a29b9f02ef (diff) | |
| download | forums-9551475fcee77cc559f5b7d0424358d874cdfd9c.tar forums-9551475fcee77cc559f5b7d0424358d874cdfd9c.tar.gz forums-9551475fcee77cc559f5b7d0424358d874cdfd9c.tar.bz2 forums-9551475fcee77cc559f5b7d0424358d874cdfd9c.tar.xz forums-9551475fcee77cc559f5b7d0424358d874cdfd9c.zip | |
[ticket/14660] Fix parsing board email messages through template engine.
PHPBB3-14660
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 29 |
2 files changed, 19 insertions, 13 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f08f5356c8..7e42cc3d26 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -642,6 +642,9 @@ class acp_board $messenger->template('test'); $messenger->set_addresses($user->data); $messenger->anti_abuse_headers($config, $user); + $messenger->assign_vars(array( + 'USERNAME' => htmlspecialchars_decode($user->data['username']), + )); $messenger->send(NOTIFY_EMAIL); trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action)); diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 3fa96afb29..10d4910494 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -624,31 +624,34 @@ class messenger */ protected function setup_template() { - global $phpbb_extension_manager, $phpbb_container, $phpbb_filesystem; + global $phpbb_container; if ($this->template instanceof \phpbb\template\template) { 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( $phpbb_container->get('path_helper'), $phpbb_container->get('config'), new \phpbb\template\context(), - new \phpbb\template\twig\environment( - $phpbb_container->get('config'), - $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'), + $template_environment, + $phpbb_container->getParameter('core.template.cache_path'), $phpbb_container->get('user'), $phpbb_container->get('template.twig.extensions.collection'), - $phpbb_extension_manager + $phpbb_container->get('ext.manager') ); } |