aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_privmsgs.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-03-21 23:10:11 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-03-21 23:10:11 +0000
commite4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c (patch)
tree8b687905d08d6af99c3396fa5c0470c7bbef4ccb /phpBB/includes/functions_privmsgs.php
parenta4e51c9699c7a09bea32ad832a9818abba008801 (diff)
downloadforums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.gz
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.bz2
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.tar.xz
forums-e4fe2d853d3e96ec4d6493e1651d93ab1b73ae1c.zip
- and my second attempt
git-svn-id: file:///svn/phpbb/trunk@5109 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
-rw-r--r--phpBB/includes/functions_privmsgs.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 640f9550aa..cd9160ec97 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -940,7 +940,8 @@ function write_pm_addresses($check_ary, $author_id, $plaintext = false)
{
$sql = 'SELECT user_id, username, user_colour
FROM ' . USERS_TABLE . '
- WHERE user_id IN (' . implode(', ', $u) . ')';
+ WHERE user_id IN (' . implode(', ', $u) . ')
+ AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@@ -1159,7 +1160,7 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
'message_text' => $data['message'],
'message_checksum' => $data['message_md5'],
'message_encoding' => $user->lang['ENCODING'],
- 'message_attachment'=> (isset($data['filename_data']['physical_filename']) && sizeof($data['filename_data']['physical_filename'])) ? 1 : 0,
+ 'message_attachment'=> (isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0,
'bbcode_bitfield' => $data['bbcode_bitfield'],
'bbcode_uid' => $data['bbcode_uid'],
'to_address' => implode(':', $to),
@@ -1180,7 +1181,7 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
'message_text' => $data['message'],
'message_checksum' => $data['message_md5'],
'message_encoding' => $user->lang['ENCODING'],
- 'message_attachment'=> (sizeof($data['filename_data']['physical_filename'])) ? 1 : 0,
+ 'message_attachment'=> (isset($data['filename_data']) && sizeof($data['filename_data'])) ? 1 : 0,
'bbcode_bitfield' => $data['bbcode_bitfield'],
'bbcode_uid' => $data['bbcode_uid']
);