aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_update.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/install/install_update.php')
-rw-r--r--phpBB/install/install_update.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5419e3edf1..9ac17e7579 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -232,7 +232,14 @@ class install_update extends module
}
// What about the language file? Got it updated?
- if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
+ 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 ($language != 'en' && in_array('language/en/install.' . $phpEx, $this->update_info['files']))
{
$lang = array();
include($this->new_location . 'language/en/install.' . $phpEx);