archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Only add the Mail "STAMPS" body section if there are stamps

Browse Source 
Summary: Ref T13053. Some mail (like push notification mail) doesn't currently generate any stamps. Drop this section if there aren't any stamps on the mail.

Test Plan: Will check push mail in production.

Maniphest Tasks: T13053

Differential Revision: https://secure.phabricator.com/D19028
This commit is contained in:
epriestley
2018-02-08 09:03:26 -08:00
parent 942b17a980
commit a8f937d313
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/applications/metamta/replyhandler/PhabricatorMailTarget.php
View File

@@ -66,7 +66,7 @@ final class PhabricatorMailTarget extends Phobject {
if ($show_stamps) { if ($show_stamps) {
$stamps = $mail->getMailStamps(); $stamps = $mail->getMailStamps();
if ($stamps) {
$body .= "\n"; $body .= "\n";
$body .= pht('STAMPS'); $body .= pht('STAMPS');
$body .= "\n"; $body .= "\n";
@@ -89,6 +89,7 @@ final class PhabricatorMailTarget extends Phobject {
$html_body .= hsprintf('%s', $html); $html_body .= hsprintf('%s', $html);
} }
} }
}
$mail->addPHIDHeaders('X-Phabricator-To', $this->rawToPHIDs); $mail->addPHIDHeaders('X-Phabricator-To', $this->rawToPHIDs);
$mail->addPHIDHeaders('X-Phabricator-Cc', $this->rawCCPHIDs); $mail->addPHIDHeaders('X-Phabricator-Cc', $this->rawCCPHIDs);