makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 14:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11062] If user's language is english there is no further work needed

Browse source 
PHPBB3-11062
This commit is contained in:
Oliver Schramm 2013-07-25 13:10:45 +02:00
parent a9f0577502
commit 7304ac9c3c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/install/install_update.php
View file

@ -239,7 +239,7 @@ class install_update extends module
// this is the user's language.. just merge it // this is the user's language.. just merge it
$user->lang = array_merge($user->lang, $lang); $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(); $lang = array();
include($this->new_location . 'language/en/install.' . $phpEx); include($this->new_location . 'language/en/install.' . $phpEx);