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

Switch to mb_convert_encoding

Browse Source 
Changing from iconv to mb_convert_encoding. $charset = 'UTF-8//TRANSLIT' is no longer needed. 'UTF-8' set as default and user may change value to whatever they wish :)
This commit is contained in:
Alex Kavon 2014-06-12 13:51:27 -06:00
parent 04b5a5ed33
commit f08630cde9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fetch/Message.php
View File

@ -167,7 +167,7 @@ class Message
*
* @var string
*/
public static $charset = 'UTF-8//TRANSLIT';
public static $charset = 'UTF-8';
/**
* This constructor takes in the uid for the message and the Imap class representing the mailbox the
@ -437,8 +437,8 @@ class Message
$messageBody = self::decode($messageBody, $structure->encoding);
if (!empty($parameters['charset']) && !preg_match('/utf-?8/i', $parameters['charset']) && $parameters['charset'] !== self::$charset)
$messageBody = iconv($parameters['charset'], self::$charset, $messageBody);
if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset)
$messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);
if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) {
if (isset($this->plaintextMessage)) {