aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/bbcode.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-08-10 02:26:16 +0200
committerTristan Darricau <github@nicofuma.fr>2014-08-10 03:32:27 +0200
commite7e6d45789d4084b98a9c6227a42976e4a1d8f7f (patch)
tree9ede14c36b2bd9f9ee1ef0ac3b2b563ec4d0d4cf /phpBB/includes/bbcode.php
parent59b5ab4866e4c687c9157898110fd0e556f6c6ac (diff)
downloadforums-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/bbcode.php')
-rw-r--r--phpBB/includes/bbcode.php21
1 files changed, 19 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 3460db4882..d5e01a7e1e 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -129,13 +129,30 @@ class bbcode
*/
function bbcode_cache_init()
{
- global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_path_helper;
+ global $phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager, $phpbb_path_helper, $phpbb_container;
if (empty($this->template_filename))
{
$this->template_bitfield = new bitfield($user->style['bbcode_bitfield']);
- $template = new phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new phpbb\template\context(), $phpbb_extension_manager);
+ $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
+ );
+
$template->set_style();
$template->set_filenames(array('bbcode.html' => 'bbcode.html'));
$this->template_filename = $template->get_source_file_for_handle('bbcode.html');