diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2013-07-25 13:10:45 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2013-07-25 13:10:45 +0200 |
| commit | 7304ac9c3ca817716f14bb8817a201b149e5ebef (patch) | |
| tree | 2a10503ae8cf4a0cc8d766eba744ae95b2fc18d8 | |
| parent | a9f05775025f010339fee5607df9b890abf472f8 (diff) | |
| download | forums-7304ac9c3ca817716f14bb8817a201b149e5ebef.tar forums-7304ac9c3ca817716f14bb8817a201b149e5ebef.tar.gz forums-7304ac9c3ca817716f14bb8817a201b149e5ebef.tar.bz2 forums-7304ac9c3ca817716f14bb8817a201b149e5ebef.tar.xz forums-7304ac9c3ca817716f14bb8817a201b149e5ebef.zip | |
[ticket/11062] If user's language is english there is no further work needed
PHPBB3-11062
| -rw-r--r-- | phpBB/install/install_update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 0afd6b07bb..9823703f0a 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -239,7 +239,7 @@ class install_update extends module // 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'])) + if ($language != 'en' && in_array('language/en/install.' . $phpEx, $this->update_info['files'])) { $lang = array(); include($this->new_location . 'language/en/install.' . $phpEx); |