aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-06-17 23:53:04 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-06-17 23:53:04 +0000
commit2ec0206283d9a7112657829ddc8e9faa3011b35a (patch)
tree1fa35a636d15b3b522467d8a7af76a8bd3375f1d /phpBB/includes
parent04b0b11e9766c72bc32762be3a8728b3bccfcdd5 (diff)
downloadforums-2ec0206283d9a7112657829ddc8e9faa3011b35a.tar
forums-2ec0206283d9a7112657829ddc8e9faa3011b35a.tar.gz
forums-2ec0206283d9a7112657829ddc8e9faa3011b35a.tar.bz2
forums-2ec0206283d9a7112657829ddc8e9faa3011b35a.tar.xz
forums-2ec0206283d9a7112657829ddc8e9faa3011b35a.zip
Switched forum_auth to the forums table
git-svn-id: file:///svn/phpbb/trunk@506 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/auth.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 18906ebc34..8c7cde2f4f 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -132,7 +132,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
{
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "WHERE au.forum_id = $forum_id" : "";
$sql = "SELECT au.forum_id, $a_sql
- FROM ".AUTH_FORUMS_TABLE." au
+ FROM ".FORUMS_TABLE." au
$forum_match_sql";
$af_result = $db->sql_query($sql);
@@ -164,7 +164,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
if($userdata['session_logged_in'])
{
- $forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND au.forum_id = $forum_id" : "";
+ $forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND ( au.forum_id = $forum_id OR au.forum_id = 0 )" : "";
$sql = "SELECT au.forum_id, $a_sql, au.auth_mod, g.group_single_user
FROM ".AUTH_ACCESS_TABLE." au, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g
WHERE ug.user_id = ".$userdata['user_id']. "