diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-04-02 13:11:43 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-04-02 13:11:43 +0200 |
| commit | 9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa (patch) | |
| tree | 5b7837ef954e19d2ef4510ba520a4acf703bbd35 /phpBB/includes | |
| parent | a895640245a3a1745e9d63f127fc47770556756c (diff) | |
| parent | 1819b64046bb0bd7538f51252fb820f160203432 (diff) | |
| download | forums-9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa.tar forums-9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa.tar.gz forums-9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa.tar.bz2 forums-9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa.tar.xz forums-9dad16c5a6835102a1bc03f3df74abbe8aa9d4fa.zip | |
Merge pull request #4271 from kasimi/ticket/14562-3.2.x
[ticket/14562] Language fallback for extension permissions (3.2.x)
* kasimi/ticket/14562-3.2.x:
[ticket/14562] Language fallback for extension permissions (3.2.x)
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index a0073ec158..a84cbd9311 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2999,8 +2999,8 @@ function add_permission_language() $lang_files = $finder ->prefix('permissions_') ->suffix(".$phpEx") - ->core_path('language/' . $user->lang_name . '/') - ->extension_directory('/language/' . $user->lang_name) + ->core_path('language/') + ->extension_directory('/language') ->find(); foreach ($lang_files as $lang_file => $ext_name) |