Fix so *-request@ addresses in Sender: header are also ignored on reply-all (#1490452)

Conflicts:
	program/steps/mail/compose.inc
pull/282/merge
Aleksander Machniak 10 years ago
parent f7dd463174
commit a9035b1561

@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
- Fix handling of non-break spaces in html to text conversion (#1490436)
- Fix self-reply detection issues (#1490439)
- Fix multi-folder search result sorting by arrival date (#1490450)
- Fix so *-request@ addresses in Sender: header are also ignored on reply-all (#1490452)
RELEASE 1.1.2
-------------

@ -352,8 +352,12 @@ foreach ($parts as $header) {
if ($v = $MESSAGE->headers->cc)
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
// Use Sender header (#1489011)
if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false)
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
if ($v = $MESSAGE->headers->get('Sender', false)) {
// Skip common mailing lists addresses: *-bounces@ and *-request@ (#1490452)
if (empty($MESSAGE->headers->others['list-post']) || !preg_match('/-(bounces|request)@/', $v)) {
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
}
}
// When To: and Reply-To: are the same we add From: address to the list (#1489037)
if ($v = $MESSAGE->headers->from) {
@ -678,7 +682,6 @@ function rcmail_compose_header_from($attrib)
return $out;
}
function rcmail_compose_editor_mode()
{
global $RCMAIL, $compose_mode;

Loading…
Cancel
Save