From 24fe97ec355da6eec64eb8304f72b68e0669dc81 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 10 Jan 2007 03:46:15 -0500
Subject: [PATCH] mb_encode_mimeheader quirks; removed unused var
---
program/steps/mail/sendmail.inc | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 2d2cb33..7c7727b 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -301,12 +301,11 @@
// 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 @@
$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");
}
--
Gitblit v1.9.1