Changeset 3018 for branches/2.2/expressoMail1_2/inc/class.message_components.inc.php

Timestamp:

07/08/10 17:52:20 (14 years ago)

Author:

amuller

Message:

Ticket #1135 - Aplicando alterações do branches 2.0 no branches 2.2

File:

• branches/2.2/expressoMail1_2/inc/class.message_components.inc.php (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.message_components.inc.php

@@ -112 +112 @@
                     $skip_next    = ($ftype == 'message/rfc822')?        true : false;
 
-                    if ($ftype == 'multipart/mixed' || $skip_part == true && $ftype == 'multipart/alternative' || $ftype == 'multipart/related' )
+                    if ($ftype == 'multipart/report' || $ftype == 'multipart/mixed' || $skip_part == true && $ftype == 'multipart/alternative' || ( $ftype == 'multipart/related' && strtolower( $parts[$p]->parts[0]->subtype ) == 'alternative' ) ) 
                     {
                         $n--;
                     }
                     else
-                    {
-                        $this->pid[$mid][$n]       = ($is_sub_part == false)? $i : ($sub_pid == '' ? '1' : $sub_pid).'.'.$i;
+                    {
+                        $this->pid[$mid][$n]       = ($is_sub_part == false || $skip_part && $ftype == 'multipart/related' )? $i : ($sub_pid == '' ? '1' : $sub_pid).'.'.$i; 
                         $this->file_type[$mid][$n] = $ftype;
                         $this->encoding[$mid][$n]  = $encoding;