[Svn] r2556 - trunk/roundcubemail/program/steps/mail

trac at roundcube.net trac at roundcube.net
Thu May 28 19:48:00 CEST 2009


Author: alec
Date: 2009-05-28 12:47:59 -0500 (Thu, 28 May 2009)
New Revision: 2556

Modified:
   trunk/roundcubemail/program/steps/mail/compose.inc
Log:
- simplified attachments handling on reply/forward/draft compose (possible regressions)
- also fix #1485847


Modified: trunk/roundcubemail/program/steps/mail/compose.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/compose.inc	2009-05-28 07:03:31 UTC (rev 2555)
+++ trunk/roundcubemail/program/steps/mail/compose.inc	2009-05-28 17:47:59 UTC (rev 2556)
@@ -601,9 +601,8 @@
   $cid_map = array();
   foreach ((array)$message->mime_parts as $pid => $part)
   {
-    if (($part->ctype_primary != 'message' || !$bodyIsHtml) &&
-        ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id']
-         || (empty($part->disposition) && $part->filename)))
+    if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->filename &&
+        ($part->disposition=='attachment' || ($part->disposition=='inline' && $bodyIsHtml) || (empty($part->disposition))))
     {
       if ($attachment = rcmail_save_attachment($message, $pid)) {
         $_SESSION['compose']['attachments'][$attachment['id']] = $attachment;

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list