makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 14:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  Revert "[ticket/14562] Language fallback for extension permissions"
  [ticket/14562] Language fallback for extension permissions (3.2.x)
  [ticket/14562] Language fallback for extension permissions
This commit is contained in:
Tristan Darricau 2016-04-02 13:13:01 +02:00
commit 92fdc14208
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_admin.php
View file

@ -2999,8 +2999,8 @@ function add_permission_language()
$lang_files = $finder $lang_files = $finder
->prefix('permissions_') ->prefix('permissions_')
->suffix(".$phpEx") ->suffix(".$phpEx")
->core_path('language/' . $user->lang_name . '/') ->core_path('language/')
->extension_directory('/language/' . $user->lang_name) ->extension_directory('/language')
->find(); ->find();
foreach ($lang_files as $lang_file => $ext_name) foreach ($lang_files as $lang_file => $ext_name)