diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-19 15:18:29 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-19 15:18:29 +0000 |
| commit | a7f0b3712a004fce6c91572f0568d1962f53b507 (patch) | |
| tree | 2dfe6d0ffded1ea281b347ecc366664a41e498d6 /phpBB/includes/ucp/ucp_groups.php | |
| parent | b934dab804da426441a8c657c198156b895b83bf (diff) | |
| download | forums-a7f0b3712a004fce6c91572f0568d1962f53b507.tar forums-a7f0b3712a004fce6c91572f0568d1962f53b507.tar.gz forums-a7f0b3712a004fce6c91572f0568d1962f53b507.tar.bz2 forums-a7f0b3712a004fce6c91572f0568d1962f53b507.tar.xz forums-a7f0b3712a004fce6c91572f0568d1962f53b507.zip | |
*** empty log message ***
git-svn-id: file:///svn/phpbb/trunk@6610 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 49e73d2ac5..e4a38f2b04 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -312,10 +312,11 @@ class ucp_groups // Hide hidden groups unless user is an admin with group privileges $sql_and = ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')'; + $sql = 'SELECT group_id, group_name, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', $group_id_ary, true) . " - AND group_type $sql_and + WHERE ' . ((sizeof($group_id_ary)) ? $db->sql_in_set('group_id', $group_id_ary, true) . ' AND ' : '') . " + group_type $sql_and ORDER BY group_type DESC, group_name"; $result = $db->sql_query($sql); |