mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-14 19:45:21 +02:00
Code Issues Releases Wiki Activity

Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9075 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-11-22 18:13:18 +00:00
parent 3d9eb90d72
commit 127750f89d
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@ -90,6 +90,7 @@
<li>[Fix] Regression bug from revision #8908 regarding log display in ACP</li> <li>[Fix] Regression bug from revision #8908 regarding log display in ACP</li>
<li>[Fix] Allow the UCP group management to work for groups with avatars. (Bug #37375)</li> <li>[Fix] Allow the UCP group management to work for groups with avatars. (Bug #37375)</li>
<li>[Fix] Fix header list build for replying oldest PM in PM history (Bug #37275)</li> <li>[Fix] Fix header list build for replying oldest PM in PM history (Bug #37275)</li>
<li>[Fix] Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175)</li>
</ul> </ul>
<a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3> <a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3>

24
phpBB/memberlist.php
View File

@ -1276,11 +1276,21 @@ switch ($mode)
$s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '>&nbsp;</option>'; $s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '>&nbsp;</option>';
$group_ids = array(); $group_ids = array();
/**
* @todo add this to a separate function (function is responsible for returning the groups the user is able to see based on the users group membership)
*/
if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
{ {
$sql = 'SELECT group_id, group_name, group_type $sql = 'SELECT group_id, group_name, group_type
FROM ' . GROUPS_TABLE . ' FROM ' . GROUPS_TABLE;
ORDER BY group_name ASC';
if (!$config['coppa_enable'])
{
$sql .= " WHERE group_name <> 'REGISTERED_COPPA'";
}
$sql .= ' ORDER BY group_name ASC';
} }
else else
{ {
@ -1292,8 +1302,14 @@ switch ($mode)
AND ug.user_id = ' . $user->data['user_id'] . ' AND ug.user_id = ' . $user->data['user_id'] . '
AND ug.user_pending = 0 AND ug.user_pending = 0
) )
WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ') WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')';
ORDER BY g.group_name ASC';
if (!$config['coppa_enable'])
{
$sql .= " WHERE group_name <> 'REGISTERED_COPPA'";
}
$sql .= ' ORDER BY g.group_name ASC';
} }
$result = $db->sql_query($sql); $result = $db->sql_query($sql);