diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-12 16:40:20 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:57:57 +0200 |
| commit | 51ab2c710e91d98bb182dded1e9d5462451151e8 (patch) | |
| tree | e9e4c0b846654472c3905bc625440dae7e53641a /phpBB/includes | |
| parent | 1dea0286a48b4bac6702aad673e13e281690adfb (diff) | |
| download | forums-51ab2c710e91d98bb182dded1e9d5462451151e8.tar forums-51ab2c710e91d98bb182dded1e9d5462451151e8.tar.gz forums-51ab2c710e91d98bb182dded1e9d5462451151e8.tar.bz2 forums-51ab2c710e91d98bb182dded1e9d5462451151e8.tar.xz forums-51ab2c710e91d98bb182dded1e9d5462451151e8.zip | |
[ticket/11574] Make install language filename less crazy
PHPBB3-11574
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/user.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/phpBB/includes/user.php b/phpBB/includes/user.php index f8ff3b8b13..b39438e315 100644 --- a/phpBB/includes/user.php +++ b/phpBB/includes/user.php @@ -590,17 +590,11 @@ class phpbb_user extends phpbb_session $language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx; } - if (defined('IN_INSTALL')) + // If we are in install, try to use the updated version, when available + $install_language_filename = str_replace('language/', 'install/update/new/language/', $language_filename); + if (defined('IN_INSTALL') && file_exists($install_language_filename)) { - // If we are in install, try to use the updated version, when available - $orig_language_filename = $language_filename; - $language_filename = str_replace('language/', 'install/update/new/language/', $language_filename); - - if (!file_exists($language_filename)) - { - // Not found, go back to the original file name - $language_filename = $orig_language_filename; - } + $language_filename = $install_language_filename; } if (!file_exists($language_filename)) |