From 35169be7ddc4dab1c26cb698db1bffcf61016b00 Mon Sep 17 00:00:00 2001 From: thomasb Date: Wed, 10 Jan 2007 08:46:15 +0000 Subject: mb_encode_mimeheader quirks; removed unused var git-svn-id: https://svn.roundcube.net/trunk@454 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/steps/mail/sendmail.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index 2d2cb33db..7c7727bba 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -301,12 +301,11 @@ $msg_body = $MAIL_MIME->get($message_param); // unset to save memory. unset($MAIL_MIME->_parts); -$msg_subject = $headers['Subject']; - if ($MBSTRING && function_exists("mb_encode_mimeheader")) { - mb_internal_encoding($CHARSET); + mb_internal_encoding($message_charset); $headers['Subject'] = mb_encode_mimeheader($headers['Subject'], $message_charset, 'Q'); + mb_internal_encoding($CHARSET); } // Begin SMTP Delivery Block @@ -358,9 +357,9 @@ if (!$savedraft) { $header_str = $MAIL_MIME->txtHeaders($headers_php); if (ini_get('safe_mode')) - $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str); + $sent = mail($headers_enc['To'], $headers['Subject'], $msg_body, $header_str); else - $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from"); + $sent = mail($headers_enc['To'], $headers['Subject'], $msg_body, $header_str, "-f$from"); } -- cgit v1.2.3