revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 22:10:55 +01:00
Code Issues Releases Wiki Activity

Fix an issue where transactions in mail were always rendered as text

Browse source 
Summary:
Fixes T12921. Currently, we call `getTitleForHTMLMail()`, but that calls `getTitleForMail()` which forces us into text rendering mode.

Instead, have `getTitleForHTML/TextMail()` force the rendering mode, then call `getTitleForMail()` with the desired rendering mode.

This causes stories like "epriestely added dependent tasks: x, y." to appear as links in email instead of plain text.

Test Plan: Used `bin/mail show-outbound --id ... --dump-html > out.html` to verify HTML mail.

Reviewers: amckinley

Reviewed By: amckinley

Maniphest Tasks: T12921

Differential Revision: https://secure.phabricator.com/D19968
This commit is contained in:
epriestley 2019-01-14 09:52:41 -08:00
parent c3cafffed7
commit 0c0cbb1c09
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
View file

@ -3265,7 +3265,7 @@ abstract class PhabricatorApplicationTransactionEditor
}
if (!$is_comment || !$seen_comment) {
$header = $xaction->getTitleForMail();
$header = $xaction->getTitleForTextMail();
if ($header !== null) {
$headers[] = $header;
}
@ -3350,7 +3350,7 @@ abstract class PhabricatorApplicationTransactionEditor
// If this is not the first comment in the mail, add the header showing
// who wrote the comment immediately above the comment.
if (!$is_initial) {
$header = $xaction->getTitleForMail();
$header = $xaction->getTitleForTextMail();
if ($header !== null) {
$body->addRawPlaintextSection($header);
}

21
src/applications/transactions/storage/PhabricatorApplicationTransaction.php
View file

@ -763,12 +763,29 @@ abstract class PhabricatorApplicationTransaction
return $this->shouldHideForFeed();
}
private function getTitleForMailWithRenderingTarget($new_target) {
$old_target = $this->getRenderingTarget();
try {
$this->setRenderingTarget($new_target);
$result = $this->getTitleForMail();
} catch (Exception $ex) {
$this->setRenderingTarget($old_target);
throw $ex;
}
$this->setRenderingTarget($old_target);
return $result;
}
public function getTitleForMail() {
return id(clone $this)->setRenderingTarget('text')->getTitle();
return $this->getTitle();
}
public function getTitleForTextMail() {
return $this->getTitleForMailWithRenderingTarget(self::TARGET_TEXT);
}
public function getTitleForHTMLMail() {
$title = $this->getTitleForMail();
$title = $this->getTitleForMailWithRenderingTarget(self::TARGET_HTML);
if ($title === null) {
return null;
}

9
src/applications/transactions/storage/PhabricatorModularTransaction.php
View file

@ -150,15 +150,6 @@ abstract class PhabricatorModularTransaction
return parent::getActionStrength();
}
public function getTitleForMail() {
$old_target = $this->getRenderingTarget();
$new_target = self::TARGET_TEXT;
$this->setRenderingTarget($new_target);
$title = $this->getTitle();
$this->setRenderingTarget($old_target);
return $title;
}
/* final */ public function getTitleForFeed() {
$title = $this->getTransactionImplementation()->getTitleForFeed();
if ($title !== null) {