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

Merge pull request #1 from alexkavon/patch-2

Browse Source 
Patch 2
This commit is contained in:
Alex Kavon 2014-06-12 18:49:40 -06:00
commit 2fc04c3d56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Fetch/Message.php
View File

@ -167,7 +167,7 @@ class Message
* *
* @var string * @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 * This constructor takes in the uid for the message and the Imap class representing the mailbox the
@ -438,7 +438,7 @@ 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)
$messageBody = iconv($parameters['charset'], self::$charset, $messageBody); $messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);
if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) { if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) {
if (isset($this->plaintextMessage)) { if (isset($this->plaintextMessage)) {