Changeset 1711 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

11/26/09 14:24:31 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #405 - Corrige problema com anexos extras ao encaminhar e-mail.

File:

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

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1859 +1859 @@
                         $mail->Body = str_replace($cid_imgs[1][$j], "cid:".$cid, $mail->Body);
 
-                                if ($msg_uid != $cid_imgs[4][$j]) // The image isn't in the same mail?
+                                if (!$forwarding_attachments[$cid_imgs[6][$j]-2]) // The image isn't in the same mail?
                                 {
                                         $fileContent = $this->get_forwarding_attachment($cid_imgs[2][$j], $cid_imgs[4][$j], $cid_imgs[6][$j], 'base64');
@@ -1874 +1874 @@
                                                 $file_description[$i]  = eregi_replace('\'*\'','',$descriptor);
                                         }
-                                        $fileContent = $this->get_forwarding_attachment($file_description[0], $msg_uid, $file_description[3], 'base64');
+                                        $fileContent = $this->get_forwarding_attachment($file_description[0], $cid_imgs[4][$j], $file_description[3], 'base64');
                                         $fileName = $file_description[2];
                                         $fileCode = $file_description[4];