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] Find language files in update/new before throwing an error

Browse source 
PHPBB3-11574
This commit is contained in:
Joas Schilling 2013-06-10 13:50:15 +02:00
parent 06caac0444
commit 8aca9635f5
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/user.php
View file

@ -590,6 +590,18 @@ 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 (!file_exists($language_filename))
{
// File was not found, try to find it in update directory
$orig_language_filename = $language_filename;
$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
if (!file_exists($language_filename))
{
// Not found either, go back to the original file name
$language_filename = $orig_language_filename;
}
}
if (!file_exists($language_filename)) if (!file_exists($language_filename))
{ {
global $config; global $config;