diff options
Diffstat (limited to 'phpBB/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index df9b6c1c7e..a4d614b1bf 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -201,7 +201,7 @@ class install_update extends module } // Check if the update files stored are for the latest version... - if ($this->latest_version != $this->update_info['version']['to']) + if (phpbb_version_compare($this->latest_version, $this->update_info['version']['to'], '>')) { $this->unequal_version = true; @@ -229,7 +229,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); |