From 9cf0d58e5da0d3673481456e38257ca41cc3d987 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 24 Jan 2019 14:59:34 -0800
Subject: [PATCH] (stable) Fix bad "$this" references in "Must Encrypt" mail
 after MailEngine changes

Summary: See PHI1038. I missed these when pulling the code out.

Test Plan: Sent "Must encrypt" mail, verified it made it through the queue in one piece.

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D20029
---
 .../metamta/engine/PhabricatorMailEmailEngine.php           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/applications/metamta/engine/PhabricatorMailEmailEngine.php b/src/applications/metamta/engine/PhabricatorMailEmailEngine.php
index fc00ccb3bb..ef7b92a7d3 100644
--- a/src/applications/metamta/engine/PhabricatorMailEmailEngine.php
+++ b/src/applications/metamta/engine/PhabricatorMailEmailEngine.php
@@ -90,9 +90,9 @@ final class PhabricatorMailEmailEngine
     if ($must_encrypt) {
       $parts = array();
 
-      $encrypt_uri = $this->getMustEncryptURI();
+      $encrypt_uri = $mail->getMustEncryptURI();
       if (!strlen($encrypt_uri)) {
-        $encrypt_phid = $this->getRelatedPHID();
+        $encrypt_phid = $mail->getRelatedPHID();
         if ($encrypt_phid) {
           $encrypt_uri = urisprintf(
             '/object/%s/',
@@ -111,7 +111,7 @@ final class PhabricatorMailEmailEngine
         'secure channel. To view the message content, follow this '.
         'link:');
 
-      $parts[] = PhabricatorEnv::getProductionURI($this->getURI());
+      $parts[] = PhabricatorEnv::getProductionURI($mail->getURI());
 
       $body = implode("\n\n", $parts);
     } else {