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

diff --git a/functions/smtp.php b/functions/smtp.php
index 498bc0c5f201f966021b54a67e37ffc2b8d83e1d..8b81c90c26c1745623370a4cb29d292f9c357570 100644 (file)
--- 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();