From 0ef497b874b95ad86f581e03d12834b3e8e509c0 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 20 Aug 2010 11:17:43 -0600 Subject: [PATCH] More places to explicitly pass the charset. --- imp/lib/Compose.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index fa5ce5aa1..b83e97b85 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -2480,7 +2480,7 @@ class IMP_Compose $type = $part->getType(); $part_charset = $part->getCharset(); $charset = $GLOBALS['registry']->getCharset(); - $msg = Horde_String::convertCharset($part->getContents(), $part_charset); + $msg = Horde_String::convertCharset($part->getContents(), $part_charset, $charset); /* Enforce reply limits. */ if (!empty($options['replylimit']) && @@ -2492,7 +2492,7 @@ class IMP_Compose } if ($mode == 'html') { - $msg = $GLOBALS['injector']->getInstance('Horde_Text_Filter')->filter($msg, array('cleanhtml', 'xss'), array(array('body_only' => true), array('strip_styles' => true, 'strip_style_attributes' => false))); + $msg = $GLOBALS['injector']->getInstance('Horde_Text_Filter')->filter($msg, array('cleanhtml', 'xss'), array(array('body_only' => true), array('charset' => $charset, 'strip_styles' => true, 'strip_style_attributes' => false))); } elseif ($type == 'text/html') { $msg = $GLOBALS['injector']->getInstance('Horde_Text_Filter')->filter($msg, 'html2text'); $type = 'text/plain'; -- 2.11.0