revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-03 18:38:27 +01:00
Code Issues Releases Wiki Activity

(stable) Fix bad "$this" references in "Must Encrypt" mail after MailEngine changes

Browse source 
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
This commit is contained in:
epriestley 2019-01-24 14:59:34 -08:00
parent 491ba6d77e
commit 9cf0d58e5d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/applications/metamta/engine/PhabricatorMailEmailEngine.php
View file

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