diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-10 02:26:16 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-10 03:32:27 +0200 |
| commit | e7e6d45789d4084b98a9c6227a42976e4a1d8f7f (patch) | |
| tree | 9ede14c36b2bd9f9ee1ef0ac3b2b563ec4d0d4cf /phpBB/includes/functions_messenger.php | |
| parent | 59b5ab4866e4c687c9157898110fd0e556f6c6ac (diff) | |
| download | forums-e7e6d45789d4084b98a9c6227a42976e4a1d8f7f.tar forums-e7e6d45789d4084b98a9c6227a42976e4a1d8f7f.tar.gz forums-e7e6d45789d4084b98a9c6227a42976e4a1d8f7f.tar.bz2 forums-e7e6d45789d4084b98a9c6227a42976e4a1d8f7f.tar.xz forums-e7e6d45789d4084b98a9c6227a42976e4a1d8f7f.zip | |
[ticket/12957] Update the constructions of the template engine
PHPBB3-12957
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 3657a89aa0..4b4ee10259 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -637,14 +637,30 @@ class messenger */ protected function setup_template() { - global $config, $phpbb_path_helper, $user, $phpbb_extension_manager; + global $config, $phpbb_path_helper, $user, $phpbb_extension_manager, $phpbb_container; if ($this->template instanceof \phpbb\template\template) { return; } - $this->template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new \phpbb\template\context(), $phpbb_extension_manager); + $this->template = new \phpbb\template\twig\twig( + $phpbb_container->get('path_helper'), + $phpbb_container->get('config'), + $phpbb_container->get('user'), + new \phpbb\template\context(), + new \phpbb\template\twig\environment( + $phpbb_container->get('config'), + $phpbb_container->get('path_helper'), + $phpbb_container, + $phpbb_container->getParameter('core.root_path') . 'cache/', + $phpbb_container->get('ext.manager'), + new \phpbb\template\twig\loader() + ), + $phpbb_container->getParameter('core.root_path') . 'cache/', + $phpbb_container->get('template.twig.extensions.collection'), + $phpbb_extension_manager + ); } /** |