diff options
| author | MateBartus <mate.bartus@gmail.com> | 2015-05-01 19:04:21 +0200 |
|---|---|---|
| committer | MateBartus <mate.bartus@gmail.com> | 2015-05-05 19:16:49 +0200 |
| commit | 7b301e22f32e9209bb4e3ea17a5637a84a4ef908 (patch) | |
| tree | 20c56c1c0982976a0234409bdd7bf05050353545 /phpBB/install | |
| parent | de687f32ed8df438cb798d98f1a5dda7a5ac76dc (diff) | |
| download | forums-7b301e22f32e9209bb4e3ea17a5637a84a4ef908.tar forums-7b301e22f32e9209bb4e3ea17a5637a84a4ef908.tar.gz forums-7b301e22f32e9209bb4e3ea17a5637a84a4ef908.tar.bz2 forums-7b301e22f32e9209bb4e3ea17a5637a84a4ef908.tar.xz forums-7b301e22f32e9209bb4e3ea17a5637a84a4ef908.zip | |
[ticket/13804] Make template's user dependency optional
PHPBB3-13804
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 657825ca39..056c827669 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -138,6 +138,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->register('language.loader')->setSynthetic(true); $phpbb_container->compile(); $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); @@ -288,16 +289,18 @@ $twig_environment = new \phpbb\template\twig\environment( $phpbb_container->get('template.twig.loader') ); +$language_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $phpbb_container->set('template.twig.environment', $twig_environment); +$phpbb_container->set('language.loader', $language_loader); $twig_context = new \phpbb\template\context(); $template = new \phpbb\template\twig\twig( $phpbb_path_helper, $config, - $user, $twig_context, $twig_environment, $cache_path, - array(new \phpbb\template\twig\extension($twig_context, $user)) + $user, + array($phpbb_container->get('template.twig.extensions.phpbb')) ); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); |