RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2024-11-22 11:16:03 +03:00
Code Issues Projects Releases Wiki Activity

Catch exceptions from mb_convert_encoding and default to iconv

Browse Source
This commit is contained in:
Bernhard Breytenbach 2014-09-17 21:56:59 +02:00
parent b96c24a3e9
commit 38dd385cb8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Fetch/Message.php
View File

@ -10,6 +10,7 @@
*/ */
namespace Fetch; namespace Fetch;
use Exception;
/** /**
* This library is a wrapper around the Imap library functions included in php. This class represents a single email * This library is a wrapper around the Imap library functions included in php. This class represents a single email
@ -463,10 +464,21 @@ class Message
$messageBody = self::decode($messageBody, $structure->encoding); $messageBody = self::decode($messageBody, $structure->encoding);
if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset) { if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset) {
$mb_converted = false;
if (function_exists('mb_convert_encoding')) { if (function_exists('mb_convert_encoding')) {
$messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']); try {
} else { $messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);
$messageBody = iconv($parameters['charset'], self::$charset . self::$charsetFlag, $messageBody); $mb_converted = true;
} catch (Exception $e) {
// @TODO Handle exception
}
}
if ( ! $mb_converted) {
try {
$messageBody = iconv($parameters['charset'], self::$charset . self::$charsetFlag, $messageBody);
} catch (Exception $e) {
// @TODO Handle exception
}
} }
} }