diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-10 10:23:28 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-10 10:23:28 +0200 |
| commit | 3450b793e7645d2590a9164c8f1d9d05df94e77e (patch) | |
| tree | 009f28dd5eb0d1f4125e186a30af68f997ce7e51 /phpBB/install/index.php | |
| parent | ab2878b37b711c0eb2faed4f7b2db55145b7044c (diff) | |
| parent | 143c1ba8d10bc27500812acd433ffca56110f02c (diff) | |
| download | forums-3450b793e7645d2590a9164c8f1d9d05df94e77e.tar forums-3450b793e7645d2590a9164c8f1d9d05df94e77e.tar.gz forums-3450b793e7645d2590a9164c8f1d9d05df94e77e.tar.bz2 forums-3450b793e7645d2590a9164c8f1d9d05df94e77e.tar.xz forums-3450b793e7645d2590a9164c8f1d9d05df94e77e.zip | |
Merge pull request #2859 from Nicofuma/ticket/12957
[ticket/12957] Update the constructions of the template engine
Diffstat (limited to 'phpBB/install/index.php')
| -rw-r--r-- | phpBB/install/index.php | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 395aff6c7d..3d5e546ffb 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -137,6 +137,7 @@ $phpbb_container_builder->set_custom_parameters(array( $phpbb_container = $phpbb_container_builder->get_container(); $phpbb_container->register('dbal.conn.driver')->setSynthetic(true); +$phpbb_container->register('template.twig.environment')->setSynthetic(true); $phpbb_container->compile(); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); @@ -268,7 +269,28 @@ $config = new \phpbb\config\config(array( $symfony_request = $phpbb_container->get('symfony_request'); $phpbb_filesystem = $phpbb_container->get('filesystem'); $phpbb_path_helper = $phpbb_container->get('path_helper'); -$template = new \phpbb\template\twig\twig($phpbb_path_helper, $config, $user, new \phpbb\template\context()); +$cache_path = $phpbb_root_path . 'cache/'; + +$twig_environment = new \phpbb\template\twig\environment( + $config, + $phpbb_path_helper, + $phpbb_container, + $cache_path, + null, + $phpbb_container->get('template.twig.loader') +); + +$phpbb_container->set('template.twig.environment', $twig_environment); +$template = new \phpbb\template\twig\twig( + $phpbb_path_helper, + $config, + $user, + new \phpbb\template\context(), + $twig_environment, + $cache_path, + array($phpbb_container->get('template.twig.extensions.phpbb')) +); + $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array_filter($paths, 'is_dir'); $template->set_custom_style(array( |