diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-28 10:42:43 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-28 10:42:43 +0200 |
| commit | 2ee9baa3d0d8ca1d1b31dbf8aa471d5726aacedc (patch) | |
| tree | f400124f5d09fdf02a1f98b02eb146907389e79b /phpBB/includes/functions_module.php | |
| parent | e62eafb77b14bee85a53ef71806b5c036b96991f (diff) | |
| parent | cc134d5fed67d826dfeadac3f93ccc6501cf7d5e (diff) | |
| download | forums-2ee9baa3d0d8ca1d1b31dbf8aa471d5726aacedc.tar forums-2ee9baa3d0d8ca1d1b31dbf8aa471d5726aacedc.tar.gz forums-2ee9baa3d0d8ca1d1b31dbf8aa471d5726aacedc.tar.bz2 forums-2ee9baa3d0d8ca1d1b31dbf8aa471d5726aacedc.tar.xz forums-2ee9baa3d0d8ca1d1b31dbf8aa471d5726aacedc.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index d0d09fe9fb..01d3f000c4 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -1088,7 +1088,7 @@ class p_master ->core_path('language/' . $user->lang_name . '/mods/') ->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) { $user->add_lang_ext($ext_name, $lang_file); |