From 30a0cf29fbc971e04f62be9ef12da3e03327d5d5 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 25 Mar 2006 16:10:57 +0000 Subject: [PATCH] do not ask why i put the pm table there instead of the polls. :o - remove forum description from title tag (now it's able to hold bbcode etc. resulting in broken layout) git-svn-id: file:///svn/phpbb/trunk@5721 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_privmsgs.php | 16 ++++++++++++---- phpBB/posting.php | 2 +- phpBB/styles/subSilver/template/mcp_header.html | 2 +- .../styles/subSilver/template/posting_body.html | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 9105c09c52..3442e2fcc6 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1111,12 +1111,20 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr { foreach ($data['address_list'][$ug_type] as $id => $field) { + $id = (int) $id; + + // Do not rely on the address list being "valid" + if (!$id) + { + continue; + } + $field = ($field == 'to') ? 'to' : 'bcc'; if ($ug_type == 'u') { $recipients[$id] = $field; } - ${$field}[] = $ug_type . '_' . (int) $id; + ${$field}[] = $ug_type . '_' . $id; } } } @@ -1229,9 +1237,9 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr foreach ($recipients as $user_id => $type) { $sql_ary[] = array( - 'msg_id' => $data['msg_id'], - 'user_id' => $user_id, - 'author_id' => $data['from_user_id'], + 'msg_id' => (int) $data['msg_id'], + 'user_id' => (int) $user_id, + 'author_id' => (int) $data['from_user_id'], 'folder_id' => PRIVMSGS_NO_BOX, 'new' => 1, 'unread' => 1, diff --git a/phpBB/posting.php b/phpBB/posting.php index d6ab653763..83217eab81 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1702,7 +1702,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u default: foreach ($sql_insert_ary as $ary) { - $db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', $ary)); + $db->sql_query('INSERT INTO ' . POLL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $ary)); } break; } diff --git a/phpBB/styles/subSilver/template/mcp_header.html b/phpBB/styles/subSilver/template/mcp_header.html index f07d6121dd..547afc329a 100644 --- a/phpBB/styles/subSilver/template/mcp_header.html +++ b/phpBB/styles/subSilver/template/mcp_header.html @@ -16,7 +16,7 @@ function marklist(form_name, status)