Page MenuHomePhabricator
Files F14868299

D11571.diff
No OneTemporary
Actions

D11571.diff
View Options

diff --git a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
--- a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
+++ b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
@@ -41,7 +41,9 @@
$handler->setActor($sender);
$handler->setExcludeMailRecipientPHIDs(
$mail->loadExcludeMailRecipientPHIDs());
- $handler->setApplicationEmail($this->getApplicationEmail());
+ if ($this->getApplicationEmail()) {
+ $handler->setApplicationEmail($this->getApplicationEmail());
+ }
$handler->processEmail($mail);
$mail->setRelatedPHID($task->getPHID());
diff --git a/src/applications/maniphest/mail/ManiphestReplyHandler.php b/src/applications/maniphest/mail/ManiphestReplyHandler.php
--- a/src/applications/maniphest/mail/ManiphestReplyHandler.php
+++ b/src/applications/maniphest/mail/ManiphestReplyHandler.php
@@ -170,9 +170,11 @@
->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
->setContinueOnNoEffect(true)
->setContinueOnMissingFields(true)
- ->setContentSource($content_source)
- ->setApplicationEmail($this->getApplicationEmail())
- ->applyTransactions($task, $xactions);
+ ->setContentSource($content_source);
+ if ($this->getApplicationEmail()) {
+ $editor->setApplicationEmail($this->getApplicationEmail());
+ }
+ $editor->applyTransactions($task, $xactions);
$event = new PhabricatorEvent(
PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2438,7 +2438,9 @@
$adapter = $this->buildHeraldAdapter($object, $xactions);
$adapter->setContentSource($this->getContentSource());
$adapter->setIsNewObject($this->getIsNewObject());
- $adapter->setApplicationEmail($this->getApplicationEmail());
+ if ($this->getApplicationEmail()) {
+ $adapter->setApplicationEmail($this->getApplicationEmail());
+ }
$xscript = HeraldEngine::loadAndApplyRules($adapter);
$this->setHeraldAdapter($adapter);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 2:05 AM (19 h, 13 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7103969
Default Alt Text
D11571.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility