if html attachment has character set information, it can be converted.

missing part of 1195232 patch

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10139 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/view_text.php b/src/view_text.php
index 6c145950c8950f5d9a1c835fef63e62c59613363..63fc896058073d198f5f0c4906d9fee9774d65fd 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -71,6 +71,9 @@ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
 
 if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html')) {
     $body = MagicHTML( $body, $passed_id, $message, $mailbox);
+    // html attachment with character set information
+    if (! empty($charset))
+        $body = charset_decode($charset,$body,false,true);
 } else {
     translateText($body, $wrap_at, $charset);
 }