From 145dcc6d02455759e919a0d100b7fc388bdf1239 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 10 Nov 2011 15:18:10 +0000 Subject: [PATCH] handle utf-16 plain text attachments - now using translation::convert --- felamimail/inc/class.felamimail_bo.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felamimail/inc/class.felamimail_bo.inc.php b/felamimail/inc/class.felamimail_bo.inc.php index 016cab1cc4..9d77b1ccb0 100644 --- a/felamimail/inc/class.felamimail_bo.inc.php +++ b/felamimail/inc/class.felamimail_bo.inc.php @@ -1491,7 +1491,7 @@ class felamimail_bo } if ($structure->type === 'TEXT' && isset($structure->parameters['CHARSET']) && stripos('UTF-16',$structure->parameters['CHARSET'])!==false) { - $attachment = mb_convert_encoding($attachment,self::$displayCharset,$structure->parameters['CHARSET']); + $attachment = translation::convert($attachment,$structure->parameters['CHARSET'],self::$displayCharset); } $attachmentData = array(