summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-05-28 17:47:59 +0000
committeralecpl <alec@alec.pl>2009-05-28 17:47:59 +0000
commit12217da8b32a4e941d6b1c48601b223679224233 (patch)
treea5fc7f6315f6d01ed116edc6868dd6a00f12afa4 /program/steps
parent36e52648faa3bed3ee10c042e4d6ab281a5cca58 (diff)
- simplified attachments handling on reply/forward/draft compose (possible regressions)
- also fix #1485847
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index f167053de..8d43de050 100644
--- a/program/steps/mail/compose.inc
+++ b/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;