Changeset 2775 for branches

Timestamp:

05/13/10 14:33:24 (14 years ago)

Author:

niltonneto

Message:

Ticket #1068 - Corrigido problema na visualização de mensagem 'multipart/alternative'.

File:

• branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -757 +757 @@
                         {
                                 $file_type = strtolower($msg->file_type[$msg_number][$values]); 
-                                if($file_type == "message/rfc822")
+                                if($file_type == "message/rfc822" || $file_type == "multipart/alternative")
                                 {
-                                        // Show only 'text/html' part, when message/rfc822 format contains 'text/plain' alternative part.
+                                        // Show only 'text/html' part, when message/rfc822 or multipart/alternative format contains 'text/plain' alternative part.
                                         if(array_key_exists($values+1, $msg->file_type[$msg_number]) &&
                                                 strtolower($msg->file_type[$msg_number][$values+1]) == 'text/plain' &&
@@ -767 +767 @@
                                         }
                                 }
-                                
-                                if($file_type == "multipart/alternative")
-                                        $has_multipart = false;
-                                
+                                                                
                                 if(($file_type == "text/plain" 
                                         || $file_type == "text/html")