Page MenuHomePhabricator

D10234.id24625.diff
No OneTemporary

D10234.id24625.diff

diff --git a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
--- a/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementSendTestWorkflow.php
@@ -117,7 +117,6 @@
->addCCs($ccs)
->setSubject($subject)
->setBody($body)
- ->setOverrideNoSelfMailPreference(true)
->setIsHTML($is_html)
->setIsBulk($is_bulk)
->setMailTags($tags);
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
@@ -17,8 +17,6 @@
protected $message;
protected $relatedPHID;
- private $excludePHIDs = array();
- private $overrideNoSelfMail = false;
private $recipientExpansionMap;
public function __construct() {
@@ -106,21 +104,13 @@
return $this;
}
- public function setExcludeMailRecipientPHIDs($exclude) {
- $this->excludePHIDs = $exclude;
+ public function setExcludeMailRecipientPHIDs(array $exclude) {
+ $this->setParam('exclude', $exclude);
return $this;
}
- private function getExcludeMailRecipientPHIDs() {
- return $this->excludePHIDs;
- }
-
- public function getOverrideNoSelfMailPreference() {
- return $this->overrideNoSelfMail;
- }
- public function setOverrideNoSelfMailPreference($override) {
- $this->overrideNoSelfMail = $override;
- return $this;
+ private function getExcludeMailRecipientPHIDs() {
+ return $this->getParam('exclude', array());
}
public function getTranslation(array $objects) {
@@ -819,7 +809,7 @@
->withPHIDs(array($from_phid))
->execute();
$from_user = head($from_user);
- if ($from_user && !$this->getOverrideNoSelfMailPreference()) {
+ if ($from_user) {
$pref_key = PhabricatorUserPreferences::PREFERENCE_NO_SELF_MAIL;
$exclude_self = $from_user
->loadPreferences()

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 11:47 AM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6300585
Default Alt Text
D10234.id24625.diff (2 KB)

Event Timeline