aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:38 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:38 +0100
commitee781806ebff950e9c645e80686f2d1d9b9545be (patch)
treee01ec016af6191927fd24dbf4d180bcf22711fc5 /phpBB/includes/auth.php
parent5324afeffd84810db3cac6e1d8dfec3678ab99c6 (diff)
parente2ef99012194cd320c44ba70013988dcac96cae5 (diff)
downloadforums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar
forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar.gz
forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar.bz2
forums-ee781806ebff950e9c645e80686f2d1d9b9545be.tar.xz
forums-ee781806ebff950e9c645e80686f2d1d9b9545be.zip
Merge commit 'release-3.0.2-RC1'
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 8dd15fea64..d0b38b67a3 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -800,7 +800,7 @@ class auth
{
$this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']);
}
- else
+ else if (!empty($this->role_cache[$row['auth_role_id']]))
{
foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting)
{