diff --git a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php --- a/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php +++ b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php @@ -106,9 +106,11 @@ } } + // NOTE: The legacy "silent" flag is now ignored and has no effect. See + // T13042. + $editor = id(new DifferentialTransactionEditor()) ->setActor($viewer) - ->setDisableEmail($request->getValue('silent')) ->setContentSource($request->newContentSource()) ->setContinueOnNoEffect(true) ->setContinueOnMissingFields(true); 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 @@ -59,7 +59,6 @@ private $isHeraldEditor; private $isInverseEdgeEditor; private $actingAsPHID; - private $disableEmail; private $heraldEmailPHIDs = array(); private $heraldForcedEmailPHIDs = array(); @@ -206,21 +205,6 @@ return $this->isHeraldEditor; } - /** - * Prevent this editor from generating email when applying transactions. - * - * @param bool True to disable email. - * @return this - */ - public function setDisableEmail($disable_email) { - $this->disableEmail = $disable_email; - return $this; - } - - public function getDisableEmail() { - return $this->disableEmail; - } - public function setUnmentionablePHIDMap(array $map) { $this->unmentionablePHIDMap = $map; return $this; @@ -1152,11 +1136,9 @@ // Editors need to pass into workers. $object = $this->willPublish($object, $xactions); - if (!$this->getDisableEmail()) { - if ($this->shouldSendMail($object, $xactions)) { - $this->mailToPHIDs = $this->getMailTo($object); - $this->mailCCPHIDs = $this->getMailCC($object); - } + if ($this->shouldSendMail($object, $xactions)) { + $this->mailToPHIDs = $this->getMailTo($object); + $this->mailCCPHIDs = $this->getMailCC($object); } if ($this->shouldPublishFeedStory($object, $xactions)) { @@ -1204,10 +1186,8 @@ $this->object = $object; $messages = array(); - if (!$this->getDisableEmail()) { - if ($this->shouldSendMail($object, $xactions)) { - $messages = $this->buildMail($object, $xactions); - } + if ($this->shouldSendMail($object, $xactions)) { + $messages = $this->buildMail($object, $xactions); } if ($this->supportsSearch()) { @@ -3504,7 +3484,6 @@ private function getAutomaticStateProperties() { return array( 'parentMessageID', - 'disableEmail', 'isNewObject', 'heraldEmailPHIDs', 'heraldForcedEmailPHIDs',