makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3990 from CHItA/ticket/13371

Browse source 
[ticket/13371] Fix language loading for the old installer

* CHItA/ticket/13371:
  [ticket/13371] Add language files to the service as well
  [ticket/13371] Use user selected language in old installer
  [ticket/13371] Fix language loading for the old installer
This commit is contained in:
Tristan Darricau 2015-10-17 15:36:19 +02:00
commit a928b109d3
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/install/index.php
View file

@ -243,6 +243,8 @@ $sub = $request->variable('sub', '');
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
$lang_service = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $lang_service = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
$lang_service->add_lang($load_lang_files);
$lang_service->set_user_language($language);
$user = new \phpbb\user($lang_service, '\phpbb\datetime'); $user = new \phpbb\user($lang_service, '\phpbb\datetime');
$auth = new \phpbb\auth\auth(); $auth = new \phpbb\auth\auth();
@ -303,6 +305,11 @@ $template = new \phpbb\template\twig\twig(
array($phpbb_container->get('template.twig.extensions.phpbb')) array($phpbb_container->get('template.twig.extensions.phpbb'))
); );
/** @var \phpbb\language\language $lang_service */
$lang_service = $phpbb_container->get('language');
$lang_service->add_lang($load_lang_files);
$lang_service->set_user_language($language);
$paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style'); $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_path . 'style');
$paths = array_filter($paths, 'is_dir'); $paths = array_filter($paths, 'is_dir');
$template->set_custom_style(array( $template->set_custom_style(array(