@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Application Emails - conditionally pass around the application email
Summary: due to typehints, passing null is going to barf here. Ref D11564, ref T5039.
Test Plan: made an edit to a task from the web ui and it didnt fatal
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T5039
Differential Revision: https://secure.phabricator.com/D11571
+11
-5
+3
-1
src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
+3
-1
src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
···
41
41
$handler->setActor($sender);
42
42
$handler->setExcludeMailRecipientPHIDs(
43
43
$mail->loadExcludeMailRecipientPHIDs());
44
-
$handler->setApplicationEmail($this->getApplicationEmail());
44
+
if ($this->getApplicationEmail()) {
45
+
$handler->setApplicationEmail($this->getApplicationEmail());
46
+
}
45
47
$handler->processEmail($mail);
46
48
47
49
$mail->setRelatedPHID($task->getPHID());
+5
-3
src/applications/maniphest/mail/ManiphestReplyHandler.php
+5
-3
src/applications/maniphest/mail/ManiphestReplyHandler.php
···
170
170
->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
171
171
->setContinueOnNoEffect(true)
172
172
->setContinueOnMissingFields(true)
173
-
->setContentSource($content_source)
174
-
->setApplicationEmail($this->getApplicationEmail())
175
-
->applyTransactions($task, $xactions);
173
+
->setContentSource($content_source);
174
+
if ($this->getApplicationEmail()) {
175
+
$editor->setApplicationEmail($this->getApplicationEmail());
176
+
}
177
+
$editor->applyTransactions($task, $xactions);
176
178
177
179
$event = new PhabricatorEvent(
178
180
PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
+3
-1
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+3
-1
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
···
2438
2438
$adapter = $this->buildHeraldAdapter($object, $xactions);
2439
2439
$adapter->setContentSource($this->getContentSource());
2440
2440
$adapter->setIsNewObject($this->getIsNewObject());
2441
-
$adapter->setApplicationEmail($this->getApplicationEmail());
2441
+
if ($this->getApplicationEmail()) {
2442
+
$adapter->setApplicationEmail($this->getApplicationEmail());
2443
+
}
2442
2444
$xscript = HeraldEngine::loadAndApplyRules($adapter);
2443
2445
2444
2446
$this->setHeraldAdapter($adapter);