makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#10627 - revert previous permission inclusion change, forgot that that permissions_phpbb indeed need to be added as the first file.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7502 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-05-07 21:13:18 +00:00
parent 42ea2b5e2d
commit 383e27dba8
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_admin.php
View file

@ -2955,9 +2955,12 @@ function add_permission_language()
{
global $user, $phpEx;
// First of all, our own file. We need to include it as the first file because it presets all relevant variables.
$user->add_lang('acp/permissions_phpbb');
$files_to_add = array();
// Search in acp and mods folder for permissions_ files.
// Now search in acp and mods folder for permissions_ files.
foreach (array('acp/', 'mods/') as $path)
{
$dh = @opendir($user->lang_path . $path);
@ -2966,7 +2969,7 @@ function add_permission_language()
{
while (($file = readdir($dh)) !== false)
{
if (strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
if ($file !== 'permissions_phpbb.' . $phpEx && strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx)
{
$files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1));
}