diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2013-07-25 12:29:25 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2013-07-25 12:29:25 +0200 |
| commit | a9f05775025f010339fee5607df9b890abf472f8 (patch) | |
| tree | 0a6bfc2a987379696b11c28b7f6abf215026a132 /phpBB | |
| parent | c0795cc4daae6af400d2a3493277819369c4985a (diff) | |
| download | forums-a9f05775025f010339fee5607df9b890abf472f8.tar forums-a9f05775025f010339fee5607df9b890abf472f8.tar.gz forums-a9f05775025f010339fee5607df9b890abf472f8.tar.bz2 forums-a9f05775025f010339fee5607df9b890abf472f8.tar.xz forums-a9f05775025f010339fee5607df9b890abf472f8.zip | |
[ticket/11062] Load new strings from user's language file if provided
PHPBB3-11062
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/install_update.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index c18a0fb4ec..0afd6b07bb 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -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(); |