diff options
| author | MateBartus <mate.bartus@gmail.com> | 2015-04-14 02:31:23 +0200 |
|---|---|---|
| committer | MateBartus <mate.bartus@gmail.com> | 2015-05-02 13:37:12 +0200 |
| commit | 179a4700221aa49071b07d638c44b9326c7a14a8 (patch) | |
| tree | 3dd78a5fb9353afabaa629e8dae58b7f8d99c144 /phpBB/install/index.php | |
| parent | 2f480be02d25421fa4c372c103604f24d4adf0ab (diff) | |
| download | forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar.gz forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar.bz2 forums-179a4700221aa49071b07d638c44b9326c7a14a8.tar.xz forums-179a4700221aa49071b07d638c44b9326c7a14a8.zip | |
[ticket/13762] Moving language related functionality into a separate class
PHPBB3-13762
Diffstat (limited to 'phpBB/install/index.php')
| -rw-r--r-- | phpBB/install/index.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index dd3590e854..df1229c9f2 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -241,7 +241,8 @@ $sub = $request->variable('sub', ''); // Set PHP error handler to ours set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); -$user = new \phpbb\user('\phpbb\datetime'); +$lang_service = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); +$user = new \phpbb\user($lang_service, '\phpbb\datetime'); $auth = new \phpbb\auth\auth(); // Add own hook handler, if present. :o @@ -287,14 +288,15 @@ $twig_environment = new \phpbb\template\twig\environment( ); $phpbb_container->set('template.twig.environment', $twig_environment); +$twig_context = new \phpbb\template\context(); $template = new \phpbb\template\twig\twig( $phpbb_path_helper, $config, $user, - new \phpbb\template\context(), + $twig_context, $twig_environment, $cache_path, - array($phpbb_container->get('template.twig.extensions.phpbb')) + array(new \phpbb\template\twig\extension($twig_context, $user)) ); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); |