aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-17 11:28:21 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-17 11:28:21 +0000
commit10846d462ac9aa4790157f02e6cbf76297c29b82 (patch)
treebafc6eb7aac2f104cfa055163b2def8b65887ac6 /phpBB/includes/auth.php
parentf04a3349e66984506ab71f0506d718188022e03f (diff)
downloadforums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.gz
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.bz2
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.tar.xz
forums-10846d462ac9aa4790157f02e6cbf76297c29b82.zip
fix bugs #2271 and #2273
git-svn-id: file:///svn/phpbb/trunk@6081 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth.php')
-rw-r--r--phpBB/includes/auth.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 262c1ffaf7..884f58ef0a 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -541,6 +541,7 @@ class auth
'WHERE' => '(ao.auth_option_id = a.auth_option_id OR ao.auth_option_id = r.auth_option_id)
AND a.group_id = ug.group_id
+ AND ug.user_pending = 0
' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
$sql_forum
$sql_opts",