alecpl
2009-05-28 12217da8b32a4e941d6b1c48601b223679224233
- simplified attachments handling on reply/forward/draft compose (possible regressions)
- also fix #1485847


1 files modified
5 ■■■■■ changed files
program/steps/mail/compose.inc 5 ●●●●● patch | view | raw | blame | history
program/steps/mail/compose.inc
@@ -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;