From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 5 Nov 2010 22:57:26 +0000 (-0600)
Subject: Bug #9371: Foix undefined variable.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=470ae9d33171e38e8cdd737deafa44c4f01aeae0;p=horde.git

Bug #9371: Foix undefined variable.
---

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index a7e43b49f..674c4a518 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -563,6 +563,10 @@ class IMP_Compose implements ArrayAccess, Countable, Iterator
             $mdn->addMdnRequestHeaders($barefrom);
         }
 
+        $charset = empty($opts['charset'])
+            ? $GLOBALS['registry']->getEmailCharset()
+            : $opts['charset'];
+
         $headers->addHeader('From', Horde_String::convertCharset($header['from'], 'UTF-8', $charset));
 
         if (!empty($header['replyto']) &&