aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_compose.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-03-07 16:55:20 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-03-07 16:55:20 +0000
commitd1e839625ee9b0ca796f83ff55404af4c6307561 (patch)
tree6f9f4ec262aa908150d261e51f862874b7fbfeca /phpBB/includes/ucp/ucp_pm_compose.php
parent4eac4b268b98ec65b7432685de147d76618e479d (diff)
downloadforums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar
forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.gz
forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.bz2
forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.xz
forums-d1e839625ee9b0ca796f83ff55404af4c6307561.zip
- fix some group specific bugs
- correctly determining terrafrost's birthday mod git-svn-id: file:///svn/phpbb/trunk@7143 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index fed72402f2..b5cba63c97 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -74,7 +74,7 @@ function compose_pm($id, $mode, $action)
{
$sql = 'SELECT group_id, group_name, group_type
FROM ' . GROUPS_TABLE . '
- WHERE group_type NOT IN (' . GROUP_HIDDEN . ', ' . GROUP_CLOSED . ')
+ WHERE group_type <> ' . GROUP_HIDDEN . '
AND group_receive_pm = 1
ORDER BY group_type DESC';
$result = $db->sql_query($sql);
@@ -730,6 +730,7 @@ function compose_pm($id, $mode, $action)
$sql = 'SELECT group_id as id, group_name as name, group_colour as colour, group_type
FROM ' . GROUPS_TABLE . '
WHERE group_receive_pm = 1
+ AND group_type <> ' . GROUP_HIDDEN . '
AND ' . $db->sql_in_set('group_id', array_map('intval', array_keys($address_list['g'])));
$result['g'] = $db->sql_query($sql);
}