aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-04-16 19:41:14 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-04-16 19:41:14 +0200
commit515d3b7cd1b20750a2fba84ec57da8df5e722e5c (patch)
tree99bdec140f08170e7de71febb0393adf25a4c1ec /phpBB/includes
parentc5126af1df58229cfc30eb8cd81c311a307747cd (diff)
parentfcc8e155ec309669bebbf6e0370cecfe64c95193 (diff)
downloadforums-515d3b7cd1b20750a2fba84ec57da8df5e722e5c.tar
forums-515d3b7cd1b20750a2fba84ec57da8df5e722e5c.tar.gz
forums-515d3b7cd1b20750a2fba84ec57da8df5e722e5c.tar.bz2
forums-515d3b7cd1b20750a2fba84ec57da8df5e722e5c.tar.xz
forums-515d3b7cd1b20750a2fba84ec57da8df5e722e5c.zip
Merge pull request #4633 from rxu/ticket/14990
[ticket/14990] Add core events to the Twig environment
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_messenger.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 757a49003b..802246c1c5 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -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'));