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

hopefully fixing bug #2022 with this

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5987 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-30 16:40:16 +00:00
parent ea04b3bcbc
commit eaeaf5bfb6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/auth.php
View file

@ -89,6 +89,9 @@ class auth
/** /**
* Look up an option * Look up an option
* if the option is prefixed with !, then the result becomes negated * if the option is prefixed with !, then the result becomes negated
*
* If a forum id is specified the local option will be combined with a global option if one exist.
* If a forum id is not specified, only the global option will be checked.
*/ */
function acl_get($opt, $f = 0) function acl_get($opt, $f = 0)
{ {
@ -116,7 +119,8 @@ class auth
} }
// Is this option a local permission setting? // Is this option a local permission setting?
if (isset($this->acl_options['local'][$opt])) // But if we check for a global option only, we won't combine the options...
if ($f != 0 && isset($this->acl_options['local'][$opt]))
{ {
if (isset($this->acl[$f])) if (isset($this->acl[$f]))
{ {