From dbae1db24c9bc264945d841b76642c5d14a35a63 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 11 Apr 2008 14:21:45 +0000
Subject: merge some changes/fixes henry: is your viewonline fix/change
 missing? ;)

git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/includes/auth.php')

diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 16accea94e..3512d14d56 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -801,7 +801,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)
 				{
-- 
cgit v1.2.1