Fix broken (in 93b0a30c1c8aa29d862b587b31e52bcc344b8d16) text/plain body of...

Aleksander Machniak

2013-08-02 254af68cd8e27880276473d1583d18d221f8504d

Fix broken (in 93b0a30c1c8aa29d862b587b31e52bcc344b8d16) text/plain body of a message when using "edit as new"

 program/steps/mail/compose.inc

@@ -985,12 +985,17 @@
    $cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
  }

  // clean up html tags - XSS prevention (#1489251)
  $body = rcmail_wash_html($body, array('safe' => 1), $cid_map);
  // clean up HTML tags - XSS prevention (#1489251)
  if ($bodyIsHtml) {
    $body = rcmail_wash_html($body, array('safe' => 1), $cid_map);

  // replace cid with href in inline images links
  if ($cid_map) {
    $body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
    // remove comments (produced by washtml)
    $body = preg_replace('/<!--[^>]+-->/', '', $body);

    // replace cid with href in inline images links
    if (!empty($cid_map)) {
      $body = str_replace(array_keys($cid_map), array_values($cid_map), $body);
    }
  }

  return $body;