summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-05-01 14:27:48 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-05-01 14:27:48 +0000
commit0dfe9a2e311c9c401c6d8c52d2797d88e5b3b2a4 (patch)
treea36de1fdf633f0e034bd2353c39440c9667145ee
parent14c89dad4e75dd7b1007bed94ac75fe2bc3fcb6e (diff)
- Fix BCC header reset (#1484997)
git-svn-id: https://svn.roundcube.net/trunk@1350 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG4
-rw-r--r--roundcubemail/program/steps/mail/func.inc4
2 files changed, 7 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index da4e14a4f..6143995cd 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/05/01 (alec)
+----------
+- Fix BCC header reset (#1484997)
+
2008/04/30 (thomasb)
----------
- Introduce new application class 'rcmail' and get rid of some global vars
diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index 9a81a00ec..1c1a4c6e7 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -1419,10 +1419,12 @@ function rcmail_deliver_message(&$message, $from, $mailto)
// clean Bcc from header for recipients
$send_headers = $headers;
unset($send_headers['Bcc']);
+ // here too, it because txtHeaders() below use $message->_headers not only $send_headers
+ unset($message->_headers['Bcc']);
// send message
$smtp_response = array();
- $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers)), $msg_body, $smtp_response);
+ $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers, true)), $msg_body, $smtp_response);
// log error
if (!$sent)