Fix issue where From address was removed from Cc and Bcc fields when editin...

Aleksander Machniak

2013-09-08 6632d42717f124a938db62a69bca601f4c336257

Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)

Conflicts:

	CHANGELOG

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
- Fix error_reporting directive check (#1489323)

RELEASE 0.9.4

 program/steps/mail/compose.inc

@@ -368,7 +368,12 @@
      $mailto = format_email(rcube_idn_to_utf8($addr_part['mailto']));

      if (!in_array($mailto, $a_recipients)
        && ($header == 'to' || empty($MESSAGE->compose['from_email']) || $mailto != $MESSAGE->compose['from_email'])
        && (
          $header == 'to'
          || $compose_mode != RCUBE_COMPOSE_REPLY
          || empty($MESSAGE->compose['from_email'])
          || $mailto != $MESSAGE->compose['from_email']
        )
      ) {
        if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name'])
          $string = format_email_recipient($mailto, $addr_part['name']);