aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-03-30 10:49:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-03-30 10:49:06 +0000
commit9f82dec04b18813c060e5a090a149c1a2c140689 (patch)
treeefab7d5e9ce8166ff4bff69d180c82230c3df481 /phpBB/includes/auth.php
parent331a549c42a74472d27dadbe213618a7b914a737 (diff)
downloadforums-9f82dec04b18813c060e5a090a149c1a2c140689.tar
forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.gz
forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.bz2
forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.xz
forums-9f82dec04b18813c060e5a090a149c1a2c140689.zip
some changes/bugfixes
git-svn-id: file:///svn/phpbb/trunk@7241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth.php')
-rw-r--r--phpBB/includes/auth.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index c8aa56adc2..f28f449fba 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -121,7 +121,7 @@ class auth
// 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]) && isset($this->acl[$f][$this->acl_options['local'][$opt]]))
{
$this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]];
}