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

[ticket/11062] Load new strings from user's language file if provided

Browse source 
PHPBB3-11062
This commit is contained in:
Oliver Schramm 2013-07-25 12:29:25 +02:00
parent c0795cc4da
commit a9f0577502
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/install/install_update.php
View file

@ -232,6 +232,13 @@ class install_update extends module
}
// What about the language file? Got it updated?
if (in_array('language/' . $language . '/install.' . $phpEx, $this->update_info['files']))
{
$lang = array();
include($this->new_location . 'language/' . $language . '/install.' . $phpEx);
// this is the user's language.. just merge it
$user->lang = array_merge($user->lang, $lang);
}
if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
{
$lang = array();