diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-19 21:48:29 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-19 21:48:29 +0100 |
| commit | 82c8986aedf0b902d8db366a9eacf5fcabc2da72 (patch) | |
| tree | c0c4f01f3f6f3b342533f45bb1c29e7d8b0a24ff | |
| parent | 997ad650624df55d705629c391a757c0dcd12eff (diff) | |
| parent | b0f34afb8b79fe55d0d9bda51956b81dd10004a6 (diff) | |
| download | forums-82c8986aedf0b902d8db366a9eacf5fcabc2da72.tar forums-82c8986aedf0b902d8db366a9eacf5fcabc2da72.tar.gz forums-82c8986aedf0b902d8db366a9eacf5fcabc2da72.tar.bz2 forums-82c8986aedf0b902d8db366a9eacf5fcabc2da72.tar.xz forums-82c8986aedf0b902d8db366a9eacf5fcabc2da72.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12285' into develop
* vsephpbb/ticket/12285:
[ticket/12285] Fix mult-lingual issues between extensions
| -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; } |