diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:21:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-04-11 14:21:45 +0000 |
| commit | dbae1db24c9bc264945d841b76642c5d14a35a63 (patch) | |
| tree | f02d5f54c53ea77dd55f168aa6a578885043bc47 /phpBB/includes/auth.php | |
| parent | 82454165c31d1e67146fa7c548866067b1138318 (diff) | |
| download | forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.gz forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.bz2 forums-dbae1db24c9bc264945d841b76642c5d14a35a63.tar.xz forums-dbae1db24c9bc264945d841b76642c5d14a35a63.zip | |
merge some changes/fixes
henry: is your viewonline fix/change missing? ;)
git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth.php')
| -rw-r--r-- | phpBB/includes/auth.php | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |