diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-04 14:19:00 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-04 14:19:00 +0200 |
| commit | c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0 (patch) | |
| tree | 1b41ff540a0d3144c6ba5c57caf16af55b685cfc /program/steps | |
| parent | e6b6925b6763157a3db62ab84c3efaa9e54f9dcc (diff) | |
Fix conflicts in last commit
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index c2d7bf97d..b3844013b 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1013,18 +1013,7 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml) { global $RCMAIL, $COMPOSE, $compose_mode; -<<<<<<< HEAD $cid_map = $messages = array(); -======= - $loaded_attachments = array(); - foreach ((array)$COMPOSE['attachments'] as $attachment) { - $loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment; - } - - $cid_map = array(); - $messages = array(); - ->>>>>>> cb1715c... Fix handling of message/rfc822 attachments on message forward and edit (#1489214) foreach ((array)$message->mime_parts as $pid => $part) { if ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) { @@ -1060,12 +1049,7 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml) } } -<<<<<<< HEAD - if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) { -======= - if (($attachment = $loaded_attachments[rcmail_attachment_name($part) . $part->mimetype]) - || ($attachment = rcmail_save_attachment($message, $pid))) { ->>>>>>> cb1715c... Fix handling of message/rfc822 attachments on message forward and edit (#1489214) + if ($attachment = rcmail_save_attachment($message, $pid)) { $COMPOSE['attachments'][$attachment['id']] = $attachment; if ($bodyIsHtml && ($part->content_id || $part->content_location)) { $url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s', |