aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-03-13 15:25:20 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-03-13 15:25:20 +0000
commit8c64d7c32afa5a8c28522ac0d99faa78a75ebefc (patch)
treee288300925880cb5fc22419144217f9d0dfa14c1 /phpBB/memberlist.php
parentf115ab68a52fd3b163093d71319572251d0b1070 (diff)
downloadforums-8c64d7c32afa5a8c28522ac0d99faa78a75ebefc.tar
forums-8c64d7c32afa5a8c28522ac0d99faa78a75ebefc.tar.gz
forums-8c64d7c32afa5a8c28522ac0d99faa78a75ebefc.tar.bz2
forums-8c64d7c32afa5a8c28522ac0d99faa78a75ebefc.tar.xz
forums-8c64d7c32afa5a8c28522ac0d99faa78a75ebefc.zip
merging #r8426 to #r8430
git-svn-id: file:///svn/phpbb/trunk@8431 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r--phpBB/memberlist.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index ca71131bc1..968ab322fd 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1237,6 +1237,7 @@ switch ($mode)
{
$group_selected = request_var('search_group_id', 0);
$s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '>&nbsp;</option>';
+ $group_ids = array();
if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
{
@@ -1261,10 +1262,16 @@ switch ($mode)
while ($row = $db->sql_fetchrow($result))
{
+ $group_ids[] = $row['group_id'];
$s_group_select .= '<option value="' . $row['group_id'] . '"' . (($group_selected == $row['group_id']) ? ' selected="selected"' : '') . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
}
$db->sql_freeresult($result);
+ if ($group_selected !== 0 && !in_array($group_selected, $group_ids))
+ {
+ trigger_error('NO_GROUP');
+ }
+
$template->assign_vars(array(
'USERNAME' => $username,
'EMAIL' => $email,