From 33239183aed443950d167a16e2f8148f5a5c1852 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Wed, 27 May 2015 02:15:12 +0700
Subject: [ticket/13868] Correctly handle acp/mcp/ucp modules lang files for
 extensions

PHPBB3-13868
---
 phpBB/includes/functions_module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_module.php')

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);
-- 
cgit v1.2.1