Seriously? The variable is named as an array and initialized as a string? Well, I...

[squirrelmail.git] / functions / identity.php

diff --git a/functions/identity.php b/functions/identity.php
index 55ed924628249c8d7b70764ad94e6b8fd3fdf2ca..33c8bef30df0e31698bd51a8aee1ab9c6614bf2a 100644 (file)
--- a/functions/identity.php
+++ b/functions/identity.php
@@ -5,7 +5,7 @@
  *
  * This contains utility functions for dealing with multiple identities
  *
- * @copyright 1999-2010 The SquirrelMail Project Team
+ * @copyright 1999-2017 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -241,9 +241,9 @@ function build_from_header($identity = 0) {
         $from_mail .= '@' . $domain;
     
     if ( isset($from_name) ) {
-        $from_name_encoded = encodeHeader($from_name);
+        $from_name_encoded = encodeHeader('"' . $from_name . '"');
         if ($from_name_encoded != $from_name) {
-            return '"' . $from_name_encoded . '" <' . $from_mail . '>';
+            return $from_name_encoded . ' <' . $from_mail . '>';
         }
         return '"' . $from_name . '" <' . $from_mail . '>';
     }