aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
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/ucp
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/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index def101bc5b..23dda1438f 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -259,7 +259,7 @@ class ucp_groups
}
}
- $sql = 'SELECT g.group_id, g.group_name, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_type, ug.group_leader, ug.user_pending
+ $sql = 'SELECT g.*, ug.group_leader, ug.user_pending
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
WHERE ug.user_id = ' . $user->data['user_id'] . '
AND g.group_id = ug.group_id