diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-03 20:35:24 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-11-03 20:35:24 +0100 |
| commit | c783c37c73beb2756d900f18dd24430c1b9f41ff (patch) | |
| tree | 81bfded9172093113bd9d952a26532cfd361d388 /phpBB/phpbb/install/module/obtain_data/task | |
| parent | 8b7f711a184220928f42d5ec079af18d259981d0 (diff) | |
| parent | f991e484da91e24f82fbcb05d0b2ae11ca51852b (diff) | |
| download | forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.gz forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.bz2 forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.tar.xz forums-c783c37c73beb2756d900f18dd24430c1b9f41ff.zip | |
Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers
* CHItA/ticket/14044:
[ticket/14044] Add config as global in notify user
[ticket/14044] Fix language selection data loss
[ticket/14044] Patch language::set_fallback_array()
[ticket/14044] Fix tests
[ticket/14044] Fix wrong descriptions in install
[ticket/14044] Solve missing email template error
[ticket/14044] global $table_prefix in constants.php
[ticket/14044] Try to fix missing table prefix
[ticket/14044] Use the correct language file version
[ticket/14044] Automatically trigger rollback on insert in transaction
[ticket/14044] Use empty instead of !count
[ticket/14044] Fix Sqlite error in tests
[ticket/14044] Deduplicate the installers
Diffstat (limited to 'phpBB/phpbb/install/module/obtain_data/task')
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php index 0726cc449c..4e977981ce 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_board_data.php @@ -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 - $default_lang = $this->install_config->get('language', ''); + $default_lang = $this->install_config->get('user_language', 'en'); $langs = $this->language_helper->get_available_languages(); $lang_options = array(); diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php index ae7526a9e3..b04b8e353f 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php @@ -116,12 +116,12 @@ class obtain_email_data extends \phpbb\install\task_base implements \phpbb\insta ), 'smtp_host' => array( 'label' => 'SMTP_SERVER', - 'description' => 'SMTP_SERVER_EXPLAIN', 'type' => 'text', 'default' => $smtp_host, ), 'smtp_auth' => array( 'label' => 'SMTP_AUTH_METHOD', + 'description' => 'SMTP_AUTH_METHOD_EXPLAIN', 'type' => 'select', 'options' => $auth_options, ), |