projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e77926
)
Bug #9371: Foix undefined variable.
author
Michael M Slusarz
<slusarz@curecanti.org>
Fri, 5 Nov 2010 22:57:26 +0000
(16:57 -0600)
committer
Michael M Slusarz
<slusarz@curecanti.org>
Fri, 5 Nov 2010 22:57:26 +0000
(16:57 -0600)
imp/lib/Compose.php
patch
|
blob
|
history
diff --git
a/imp/lib/Compose.php
b/imp/lib/Compose.php
index
a7e43b4
..
674c4a5
100644
(file)
--- 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']) &&