From 78e230b7e7fe44b74208dd12465a5b9862eec0c3 Mon Sep 17 00:00:00 2001 From: gustavf Date: Wed, 5 Jul 2000 14:45:57 +0000 Subject: [PATCH] Fixed bug with 8-bit characters in personal name when sending mail. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@593 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/smtp.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/functions/smtp.php b/functions/smtp.php index 498bc0c5..8b81c90c 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -130,14 +130,12 @@ $cc_list = getLineOfAddrs($cc); $bcc_list = getLineOfAddrs($bcc); + /* Encoding 8-bit characters and making from line */ + $subject = encodeHeader($subject); if ($from == "") $from = "<$from_addr>"; else - $from = $from . " <$from_addr>"; - - /* Encoding 8-bit characters */ - $subject = encodeHeader($subject); - $from = encodeHeader($from); + $from = encodeHeader($from) . " <$from_addr>"; /* This creates an RFC 822 date */ $date = date("D, j M Y H:i:s ", mktime()) . timezone(); -- 2.25.1