Merge pull request #40 from bjornpost/fix-multipart-messagebody

In a multipart email messageBody() keeps headers
tedious · Mar 14, 2014 · 0bf95d7 · 0bf95d7
2 parents b48ca17 + 7b42853
commit 0bf95d7
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
@@ -432,7 +432,6 @@ protected function processStructure($structure, $partIdentifier = null)
             $attachment          = new Attachment($this, $structure, $partIdentifier);
             $this->attachments[] = $attachment;
         } elseif ($structure->type == 0 || $structure->type == 1) {
-
             $messageBody = isset($partIdentifier) ?
                 imap_fetchbody($this->imapStream, $this->uid, $partIdentifier, FT_UID)
                 : imap_body($this->imapStream, $this->uid, FT_UID);
@@ -442,7 +441,7 @@ protected function processStructure($structure, $partIdentifier = null)
             if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset)
                 $messageBody = iconv($parameters['charset'], self::$charset, $messageBody);
 
-            if (strtolower($structure->subtype) == 'plain' || $structure->type == 1) {
+            if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) {
                 if (isset($this->plaintextMessage)) {
                     $this->plaintextMessage .= PHP_EOL . PHP_EOL;
                 } else {
@@ -451,7 +450,6 @@ protected function processStructure($structure, $partIdentifier = null)
 
                 $this->plaintextMessage .= trim($messageBody);
             } else {
-
                 if (isset($this->htmlMessage)) {
                     $this->htmlMessage .= '<br><br>';
                 } else {