Fix bug where Reply-To address was ignored on reply to messages sent by sel...

Aleksander Machniak

2015-01-19 38dbd8022b63adfd4ff4e5eb3eb5706d8bc9def2

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

 CHANGELOG

@@ -11,6 +11,7 @@
- Fix so "set as default" option is hidden if identities_level > 1 (#1490226)
- Fix bug where search was reset after returning from compose visited for reply
- Fix javascript error in "IE 8.0/Tablet PC" browser (#1490210)
- Fix bug where Reply-To address was ignored on reply to messages sent by self (#1490233)

RELEASE 1.1-rc
--------------

 program/steps/mail/compose.inc

@@ -322,13 +322,18 @@
                $fvalue = $mailfollowup;
            else if ($mailreplyto)
                $fvalue = $mailreplyto;
            else if (!empty($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;
            }
        }