From 3176c03583bc490ca94c59f9acfe7f21a4157c2c Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Mon, 6 Mar 2006 17:28:51 +0000 Subject: [PATCH] And now it's my turn :) Bug fix for a bugfix..... git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@5604 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/auth.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 85328d2bbe..1e64187caa 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -234,6 +234,7 @@ function auth($type, $forum_id, $userdata, $f_access = '') { $value = $f_access[$k][$key]; $f_forum_id = $f_access[$k]['forum_id']; + $u_access[$f_forum_id] = isset($u_access[$f_forum_id]) ? $u_access[$f_forum_id] : array(); switch( $value ) { @@ -248,12 +249,12 @@ function auth($type, $forum_id, $userdata, $f_access = '') break; case AUTH_ACL: - $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] && isset($u_access[$f_forum_id]) ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: - $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] && isset($u_access[$f_forum_id]) ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Moderators']; break; @@ -282,8 +283,9 @@ function auth($type, $forum_id, $userdata, $f_access = '') for($k = 0; $k < count($f_access); $k++) { $f_forum_id = $f_access[$k]['forum_id']; + $u_access[$f_forum_id] = isset($u_access[$f_forum_id]) ? $u_access[$f_forum_id] : array(); - $auth_user[$f_forum_id]['auth_mod'] = ( $userdata['session_logged_in'] && isset($u_access[$f_forum_id]) ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id]['auth_mod'] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; } }