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

[ticket/14044] Fix language selection data loss

Browse source 
PHPBB3-14044
This commit is contained in:
Mate Bartus 2015-10-30 15:46:39 +01:00
parent 0990894cf8
commit 719f42c54a
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/phpbb/install/controller/helper.php
View file

@ -204,6 +204,7 @@ class helper
if ($lang !== null) if ($lang !== null)
{ {
$this->language->set_user_language($lang, true); $this->language->set_user_language($lang, true);
$this->installer_config->set('user_language', $lang);
} }
} }

2
phpBB/phpbb/install/module/install_database/task/add_config_settings.php
View file

@ -233,7 +233,7 @@ class add_config_settings extends \phpbb\install\task_base
SET username = '" . $this->db->sql_escape($this->install_config->get('admin_name')) . "', SET username = '" . $this->db->sql_escape($this->install_config->get('admin_name')) . "',
user_password='" . $this->password_manager->hash($this->install_config->get('admin_passwd')) . "', user_password='" . $this->password_manager->hash($this->install_config->get('admin_passwd')) . "',
user_ip = '" . $this->db->sql_escape($user_ip) . "', user_ip = '" . $this->db->sql_escape($user_ip) . "',
user_lang = '" . $this->db->sql_escape($this->install_config->get('language')) . "', user_lang = '" . $this->db->sql_escape($this->install_config->get('user_language', 'en')) . "',
user_email='" . $this->db->sql_escape($this->install_config->get('board_email')) . "', user_email='" . $this->db->sql_escape($this->install_config->get('board_email')) . "',
user_dateformat='" . $this->db->sql_escape($this->language->lang('default_dateformat')) . "', user_dateformat='" . $this->db->sql_escape($this->language->lang('default_dateformat')) . "',
user_email_hash = " . $this->db->sql_escape(phpbb_email_hash($this->install_config->get('board_email'))) . ", user_email_hash = " . $this->db->sql_escape(phpbb_email_hash($this->install_config->get('board_email'))) . ",

4
phpBB/phpbb/install/module/install_finish/task/notify_user.php
View file

@ -104,12 +104,14 @@ class notify_user extends \phpbb\install\task_base
$this->user->session_begin(); $this->user->session_begin();
$this->user->setup('common'); $this->user->setup('common');
$this->language->set_default_language($this->config['default_lang']);
if ($this->config['email_enable']) if ($this->config['email_enable'])
{ {
include ($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); include ($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext);
$messenger = new \messenger(false); $messenger = new \messenger(false);
$messenger->template('installed', $this->language->get_used_language()); $messenger->template('installed', $this->install_config->get('user_language', 'en'));
$messenger->to($this->config['board_email'], $this->install_config->get('admin_name')); $messenger->to($this->config['board_email'], $this->install_config->get('admin_name'));
$messenger->anti_abuse_headers($this->config, $this->user); $messenger->anti_abuse_headers($this->config, $this->user);
$messenger->assign_vars(array( $messenger->assign_vars(array(

2
phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php
View file

@ -126,7 +126,7 @@ class obtain_board_data extends \phpbb\install\task_base implements \phpbb\insta
} }
// Use language because we only check this to be valid // Use language because we only check this to be valid
$default_lang = $this->install_config->get('language', ''); $default_lang = $this->install_config->get('user_language', 'en');
$langs = $this->language_helper->get_available_languages(); $langs = $this->language_helper->get_available_languages();
$lang_options = array(); $lang_options = array();