revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 05:50:55 +01:00
Code Issues Releases Wiki Activity

Explicitly test for reply-to support before using the public reply-to address

Browse source 
Summary: We need to perform an explicit test for public reply support.
Previously, the existence of a valid result here was a sufficient implicit test
for public reply support, but it no longer is.
Test Plan: With an unmodified configuration, sent email. It generated with the
correct reply-to (me). Restored my original configuration and sent an email, it
generated with the correct (routed) reply-to.
Reviewed By: codeblock
Reviewers: codeblock
CC: aran, codeblock
Differential Revision: 626
This commit is contained in:
epriestley 2011-07-08 23:16:58 -07:00
parent e1209be057
commit 7005cac32a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/metamta/replyhandler/base/PhabricatorMailReplyHandler.php
View file

@ -83,8 +83,8 @@ abstract class PhabricatorMailReplyHandler {
$mail->addTos(mpull($to_handles, 'getPHID')); $mail->addTos(mpull($to_handles, 'getPHID'));
$mail->addCCs(mpull($cc_handles, 'getPHID')); $mail->addCCs(mpull($cc_handles, 'getPHID'));
if ($this->supportsPublicReplies()) {
$reply_to = $this->getPublicReplyHandlerEmailAddress(); $reply_to = $this->getPublicReplyHandlerEmailAddress();
if ($reply_to) {
$mail->setReplyTo($reply_to); $mail->setReplyTo($reply_to);
} }
@ -131,7 +131,7 @@ abstract class PhabricatorMailReplyHandler {
$mail->addHeader($header, $value); $mail->addHeader($header, $value);
} }
if (!$reply_to) { if (!$reply_to && $this->supportsPublicReplies()) {
$reply_to = $this->getPublicReplyHandlerEmailAddress(); $reply_to = $this->getPublicReplyHandlerEmailAddress();
} }