makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Marc Alexander 2015-05-28 10:42:43 +02:00
commit 2ee9baa3d0
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/includes/functions_module.php
View file

@ -1088,7 +1088,7 @@ class p_master
->core_path('language/' . $user->lang_name . '/mods/') ->core_path('language/' . $user->lang_name . '/mods/')
->find(); ->find();
$lang_files = array_unique(array_merge($user_lang_files, $english_lang_files, $default_lang_files)); $lang_files = array_merge($english_lang_files, $default_lang_files, $user_lang_files);
foreach ($lang_files as $lang_file => $ext_name) foreach ($lang_files as $lang_file => $ext_name)
{ {
$user->add_lang_ext($ext_name, $lang_file); $user->add_lang_ext($ext_name, $lang_file);