diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-03-19 09:10:17 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-03-19 09:10:17 -0700 |
| commit | b0f34afb8b79fe55d0d9bda51956b81dd10004a6 (patch) | |
| tree | 5d488702dcf029a8fabdc376bfefcba30199cf1f /phpBB/phpbb | |
| parent | 1af769714304054e63ffaeb41cfa51801785a59d (diff) | |
| download | forums-b0f34afb8b79fe55d0d9bda51956b81dd10004a6.tar forums-b0f34afb8b79fe55d0d9bda51956b81dd10004a6.tar.gz forums-b0f34afb8b79fe55d0d9bda51956b81dd10004a6.tar.bz2 forums-b0f34afb8b79fe55d0d9bda51956b81dd10004a6.tar.xz forums-b0f34afb8b79fe55d0d9bda51956b81dd10004a6.zip | |
[ticket/12285] Fix mult-lingual issues between extensions
PHPBB3-12285
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/user.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 6c060e21ea..b9b3896606 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -631,18 +631,20 @@ class user extends \phpbb\session else if ($this->lang_name == basename($config['default_lang'])) { // Fall back to the English Language + $reset_lang_name = $this->lang_name; $this->lang_name = 'en'; $this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name); + $this->lang_name = $reset_lang_name; } else if ($this->lang_name == $this->data['user_lang']) { // Fall back to the board default language + $reset_lang_name = $this->lang_name; $this->lang_name = basename($config['default_lang']); $this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name); + $this->lang_name = $reset_lang_name; } - // Reset the lang name - $this->lang_name = (file_exists($lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']); return; } |