From 6c83f69040b506af126cdf7d56e8796598e3405e Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 11 Nov 2008 13:06:05 -0700 Subject: [PATCH] Convert charset if viewing inline. --- imp/lib/Mime/Viewer/plain.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/imp/lib/Mime/Viewer/plain.php b/imp/lib/Mime/Viewer/plain.php index 283715b72..873fe2df5 100644 --- a/imp/lib/Mime/Viewer/plain.php +++ b/imp/lib/Mime/Viewer/plain.php @@ -29,6 +29,9 @@ class IMP_Horde_Mime_Viewer_plain extends Horde_Mime_Viewer_plain return array(); } + // Convert to the local charset. + $text = String::convertCharset($text, $this->_mimepart->getCharset()); + // If requested, scan the message for PGP data. if (!empty($conf['utils']['gnupg']) && $prefs->getValue('pgp_scan_body') && @@ -57,7 +60,7 @@ class IMP_Horde_Mime_Viewer_plain extends Horde_Mime_Viewer_plain $filters = array( 'text2html' => array( 'parselevel' => TEXT_HTML_MICRO, - 'charset' => $this->_mimepart->getCharset() + 'charset' => NLS::getCharset() ), 'tabs2spaces' => array() ); -- 2.11.0