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');