Fix bug where Reply-To address was ignored on reply to messages sent by self (#1490233)

This commit is contained in:
Aleksander Machniak
2015-01-19 16:08:42 +01:00
parent ef29153a32
commit 38dbd8022b
2 changed files with 9 additions and 3 deletions

View File

@@ -322,13 +322,18 @@ foreach ($parts as $header) {
$fvalue = $mailfollowup;
else if ($mailreplyto)
$fvalue = $mailreplyto;
else if (!empty($MESSAGE->headers->replyto))
$fvalue = $MESSAGE->headers->replyto;
else if (!empty($MESSAGE->headers->replyto)) {
$fvalue = $MESSAGE->headers->replyto;
$replyto = true;
}
else if (!empty($MESSAGE->headers->from))
$fvalue = $MESSAGE->headers->from;
// Reply to message sent by yourself (#1487074, #1489230)
if (!empty($ident) && in_array($ident['ident'], array($fvalue, $MESSAGE->headers->from))) {
// Reply-To address need to be unset (#1490233)
if (!empty($ident) && empty($replyto)
&& in_array($ident['ident'], array($fvalue, $MESSAGE->headers->from))
) {
$fvalue = $MESSAGE->headers->to;
}
}