mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity

[ticket/12285] Fix mult-lingual issues between extensions

Browse Source 
PHPBB3-12285
This commit is contained in:
Matt Friedman 2014-03-19 09:10:17 -07:00
parent 1af7697143
commit b0f34afb8b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/user.php
View File

@ -631,18 +631,20 @@ class user extends \phpbb\session
else if ($this->lang_name == basename($config['default_lang'])) else if ($this->lang_name == basename($config['default_lang']))
{ {
// Fall back to the English Language // Fall back to the English Language
$reset_lang_name = $this->lang_name;
$this->lang_name = 'en'; $this->lang_name = 'en';
$this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name); $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']) else if ($this->lang_name == $this->data['user_lang'])
{ {
// Fall back to the board default language // Fall back to the board default language
$reset_lang_name = $this->lang_name;
$this->lang_name = basename($config['default_lang']); $this->lang_name = basename($config['default_lang']);
$this->set_lang($lang, $help, $lang_file, $use_db, $use_help, $ext_name); $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; return;
} }