makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11574] Make install language filename less crazy

Browse source 
PHPBB3-11574
This commit is contained in:
Igor Wiedler 2013-07-12 16:40:20 -04:00 • committed by Joas Schilling
parent 1dea0286a4
commit 51ab2c710e
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/user.php
View file

@ -590,17 +590,11 @@ class phpbb_user extends phpbb_session
$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx; $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 // If we are in install, try to use the updated version, when available
$orig_language_filename = $language_filename; $install_language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename); if (defined('IN_INSTALL') && file_exists($install_language_filename))
if (!file_exists($language_filename))
{ {
// Not found, go back to the original file name $language_filename = $install_language_filename;
$language_filename = $orig_language_filename;
}
} }
if (!file_exists($language_filename)) if (!file_exists($language_filename))