diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-17 11:28:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-17 11:28:21 +0000 |
| commit | 10846d462ac9aa4790157f02e6cbf76297c29b82 (patch) | |
| tree | bafc6eb7aac2f104cfa055163b2def8b65887ac6 /phpBB/includes/acp/acp_permissions.php | |
| parent | f04a3349e66984506ab71f0506d718188022e03f (diff) | |
| download | forums-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/acp/acp_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 00722255c1..277281497b 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -968,6 +968,7 @@ class acp_permissions FROM ' . GROUPS_TABLE . ' g LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id) WHERE ug.user_id = ' . $user_id . ' + AND ug.user_pending = 0 ORDER BY g.group_type DESC, g.group_id DESC'; $result = $db->sql_query($sql); |