diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-28 10:42:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-28 10:42:40 +0200 |
| commit | cc134d5fed67d826dfeadac3f93ccc6501cf7d5e (patch) | |
| tree | 545baed4fd69296812a6c4828a6040e59814fb44 /phpBB/includes/functions_module.php | |
| parent | 5ca77df0844954390c08ebaee2c843c8cd03df88 (diff) | |
| parent | 33239183aed443950d167a16e2f8148f5a5c1852 (diff) | |
| download | forums-cc134d5fed67d826dfeadac3f93ccc6501cf7d5e.tar forums-cc134d5fed67d826dfeadac3f93ccc6501cf7d5e.tar.gz forums-cc134d5fed67d826dfeadac3f93ccc6501cf7d5e.tar.bz2 forums-cc134d5fed67d826dfeadac3f93ccc6501cf7d5e.tar.xz forums-cc134d5fed67d826dfeadac3f93ccc6501cf7d5e.zip | |
Merge pull request #3631 from rxu/ticket/13868
[ticket/13868] Correctly handle acp/mcp/ucp modules lang files for extensions
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 fe9bcdb9d1..f9ceecff63 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -1086,7 +1086,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); |