aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install/controller
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-03 20:35:24 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-03 20:35:24 +0100
commitc783c37c73beb2756d900f18dd24430c1b9f41ff (patch)
tree81bfded9172093113bd9d952a26532cfd361d388 /phpBB/phpbb/install/controller
parent8b7f711a184220928f42d5ec079af18d259981d0 (diff)
parentf991e484da91e24f82fbcb05d0b2ae11ca51852b (diff)
downloadforums-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/controller')
-rw-r--r--phpBB/phpbb/install/controller/helper.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php
index bfa9ec6238..fdb07d9c4a 100644
--- a/phpBB/phpbb/install/controller/helper.php
+++ b/phpBB/phpbb/install/controller/helper.php
@@ -204,6 +204,7 @@ class helper
if ($lang !== null)
{
$this->language->set_user_language($lang, true);
+ $this->installer_config->set('user_language', $lang);
}
}