From c4cbc1a32da75beb4be5bb3575ccb59585b9813d Mon Sep 17 00:00:00 2001
From: Bob Trahan <btrahan@phacility.com>
Date: Thu, 31 Jul 2014 14:54:43 -0700
Subject: [PATCH] Revert attempt to fix mail in differential

Summary: This fix is wrong - should be load and not get - but moreover this is actually correctly set as the reply handler is instantiated inside the DifferentialRevisionMailReceiver correctly; $this->getExclude was correct. Ref T5185.

Test Plan: this shall stop the fatal in production.

Reviewers: chad, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T5185

Differential Revision: https://secure.phabricator.com/D10101
---
 .../differential/mail/DifferentialReplyHandler.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/applications/differential/mail/DifferentialReplyHandler.php b/src/applications/differential/mail/DifferentialReplyHandler.php
index 467a782023..92d888f3db 100644
--- a/src/applications/differential/mail/DifferentialReplyHandler.php
+++ b/src/applications/differential/mail/DifferentialReplyHandler.php
@@ -146,21 +146,15 @@ class DifferentialReplyHandler extends PhabricatorMailReplyHandler {
             ->setContent($body));
     }
 
-    // NOTE: We have to be careful about this because Facebook's
-    // implementation jumps straight into handleAction() and will not have
-    // a PhabricatorMetaMTAReceivedMail object.
-    if ($this->receivedMail) {
-      $exclude = $this->receivedMail->getExcludeMailRecipientPHIDs();
-    } else {
-      $exclude = $this->getExcludeMailRecipientPHIDs();
-    }
-
     $editor = id(new DifferentialTransactionEditor())
       ->setActor($actor)
-      ->setExcludeMailRecipientPHIDs($exclude)
+      ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
       ->setContinueOnMissingFields(true)
       ->setContinueOnNoEffect(true);
 
+    // NOTE: We have to be careful about this because Facebook's
+    // implementation jumps straight into handleAction() and will not have
+    // a PhabricatorMetaMTAReceivedMail object.
     if ($this->receivedMail) {
       $content_source = PhabricatorContentSource::newForSource(
         PhabricatorContentSource::SOURCE_EMAIL,