Permalink
Browse files

- simplified attachments handling on reply/forward/draft compose (pos…

…sible regressions)

- also fix #1485847
  • Loading branch information...
1 parent 36e5264 commit 12217da8b32a4e941d6b1c48601b223679224233 @alecpl alecpl committed May 28, 2009
Showing with 2 additions and 3 deletions.
  1. +2 −3 program/steps/mail/compose.inc
@@ -601,9 +601,8 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
$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;

0 comments on commit 12217da

Please sign in to comment.