From 2047483cc046a220f010cd5cebfb375f29c5bcdf Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Tue, 24 Nov 2015 06:43:00 +1100 Subject: [PATCH] Render Remarkup in emails Summary: Ref T992. I noticed that `ManiphestTask` mail doesn't render Remarkup properly (instead, it renders Remarkup literally). I //think// this is because the code calls `addTextSection()` rather than `addRemarkupSection()`. Test Plan: Created a new Maniphest Task and saw Remarkup in the generated self-email (inspect the email contents with `./bin/mail show-outbound`). I didn't test the other affected applications. Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: Korvin Maniphest Tasks: T992 Differential Revision: https://secure.phabricator.com/D14511 --- src/applications/audit/editor/PhabricatorAuditEditor.php | 2 +- src/applications/badges/editor/PhabricatorBadgesEditor.php | 2 +- .../countdown/editor/PhabricatorCountdownEditor.php | 2 +- .../differential/customfield/DifferentialSummaryField.php | 2 +- .../differential/customfield/DifferentialTestPlanField.php | 2 +- .../differential/editor/DifferentialTransactionEditor.php | 2 +- .../maniphest/editor/ManiphestTransactionEditor.php | 2 +- .../phriction/editor/PhrictionTransactionEditor.php | 2 +- src/applications/phurl/editor/PhabricatorPhurlURLEditor.php | 2 +- .../releeph/editor/ReleephRequestTransactionalEditor.php | 2 +- src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php index 51efdf175b..47fa055388 100644 --- a/src/applications/audit/editor/PhabricatorAuditEditor.php +++ b/src/applications/audit/editor/PhabricatorAuditEditor.php @@ -660,7 +660,7 @@ final class PhabricatorAuditEditor } if ($inlines) { - $body->addTextSection( + $body->addRemarkupSection( pht('INLINE COMMENTS'), $this->renderInlineCommentsForMail($object, $inlines)); } diff --git a/src/applications/badges/editor/PhabricatorBadgesEditor.php b/src/applications/badges/editor/PhabricatorBadgesEditor.php index d7403601ec..ad4ccca3d2 100644 --- a/src/applications/badges/editor/PhabricatorBadgesEditor.php +++ b/src/applications/badges/editor/PhabricatorBadgesEditor.php @@ -194,7 +194,7 @@ final class PhabricatorBadgesEditor $body = parent::buildMailBody($object, $xactions); if (strlen($description)) { - $body->addTextSection( + $body->addRemarkupSeciton( pht('BADGE DESCRIPTION'), $object->getDescription()); } diff --git a/src/applications/countdown/editor/PhabricatorCountdownEditor.php b/src/applications/countdown/editor/PhabricatorCountdownEditor.php index f0962beae2..e1eddf2270 100644 --- a/src/applications/countdown/editor/PhabricatorCountdownEditor.php +++ b/src/applications/countdown/editor/PhabricatorCountdownEditor.php @@ -173,7 +173,7 @@ final class PhabricatorCountdownEditor $description = $object->getDescription(); if (strlen($description)) { - $body->addTextSection( + $body->addRemarkupSection( pht('COUNTDOWN DESCRIPTION'), $object->getDescription()); } diff --git a/src/applications/differential/customfield/DifferentialSummaryField.php b/src/applications/differential/customfield/DifferentialSummaryField.php index 91c78537cd..16a3f701c1 100644 --- a/src/applications/differential/customfield/DifferentialSummaryField.php +++ b/src/applications/differential/customfield/DifferentialSummaryField.php @@ -165,7 +165,7 @@ final class DifferentialSummaryField return; } - $body->addTextSection(pht('REVISION SUMMARY'), $summary); + $body->addRemarkupSection(pht('REVISION SUMMARY'), $summary); } } diff --git a/src/applications/differential/customfield/DifferentialTestPlanField.php b/src/applications/differential/customfield/DifferentialTestPlanField.php index 4b0869a7d8..32d3c15c31 100644 --- a/src/applications/differential/customfield/DifferentialTestPlanField.php +++ b/src/applications/differential/customfield/DifferentialTestPlanField.php @@ -195,7 +195,7 @@ final class DifferentialTestPlanField return; } - $body->addTextSection(pht('TEST PLAN'), $test_plan); + $body->addRemarkupSection(pht('TEST PLAN'), $test_plan); } diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php index fabd2511ba..b2e946cf7f 100644 --- a/src/applications/differential/editor/DifferentialTransactionEditor.php +++ b/src/applications/differential/editor/DifferentialTransactionEditor.php @@ -1212,7 +1212,7 @@ final class DifferentialTransactionEditor } if ($inlines) { - $body->addTextSection( + $body->addRemarkupSection( pht('INLINE COMMENTS'), $this->renderInlineCommentsForMail($object, $inlines)); } diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php index dcc518e06b..565f3cc627 100644 --- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php +++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php @@ -442,7 +442,7 @@ final class ManiphestTransactionEditor $body = parent::buildMailBody($object, $xactions); if ($this->getIsNewObject()) { - $body->addTextSection( + $body->addRemarkupSection( pht('TASK DESCRIPTION'), $object->getDescription()); } diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php index 5d1534df19..4cec1ccdbf 100644 --- a/src/applications/phriction/editor/PhrictionTransactionEditor.php +++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php @@ -419,7 +419,7 @@ final class PhrictionTransactionEditor $body = parent::buildMailBody($object, $xactions); if ($this->getIsNewObject()) { - $body->addTextSection( + $body->addRemarkupSection( pht('DOCUMENT CONTENT'), $object->getContent()->getContent()); } else if ($this->contentDiffURI) { diff --git a/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php b/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php index ef7f547621..712478c839 100644 --- a/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php +++ b/src/applications/phurl/editor/PhabricatorPhurlURLEditor.php @@ -236,7 +236,7 @@ final class PhabricatorPhurlURLEditor $body = parent::buildMailBody($object, $xactions); if (strlen($description)) { - $body->addTextSection( + $body->addRemarkupSection( pht('URL DESCRIPTION'), $object->getDescription()); } diff --git a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php index ecfa4c5b6b..4710557043 100644 --- a/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php +++ b/src/applications/releeph/editor/ReleephRequestTransactionalEditor.php @@ -249,7 +249,7 @@ final class ReleephRequestTransactionalEditor if ($has_pick_failure) { $instructions = $releeph_project->getDetail('pick_failure_instructions'); if ($instructions) { - $body->addTextSection( + $body->addRemarkupSection( pht('PICK FAILURE INSTRUCTIONS'), $instructions); } diff --git a/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php b/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php index 047a5c99a8..94e31e8b92 100644 --- a/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php +++ b/src/applications/slowvote/editor/PhabricatorSlowvoteEditor.php @@ -145,7 +145,7 @@ final class PhabricatorSlowvoteEditor $description = $object->getDescription(); if (strlen($description)) { - $body->addTextSection( + $body->addRemarkupSection( pht('SLOWVOTE DESCRIPTION'), $object->getDescription()); }