mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 01:36:57 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2017-04-16 19:41:19 +02:00
parent 1b9380040c 515d3b7cd1
commit 465ceab1e6
12 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions_messenger.php
View File

@@ -656,7 +656,7 @@ class messenger
*/
protected function setup_template()
{
global $phpbb_container;
global $phpbb_container, $phpbb_dispatcher;
if ($this->template instanceof \phpbb\template\template)
{
@@ -671,7 +671,9 @@ class messenger
$phpbb_container->get('ext.manager'),
new \phpbb\template\twig\loader(
$phpbb_container->get('filesystem')
)
),
$phpbb_dispatcher,
array()
);
$template_environment->setLexer($phpbb_container->get('template.twig.lexer'));