Page MenuHomePhabricator
Files F17600930

D21242.diff
No OneTemporary
Actions

D21242.diff
View Options

diff --git a/src/applications/differential/mail/DifferentialInlineCommentMailView.php b/src/applications/differential/mail/DifferentialInlineCommentMailView.php
--- a/src/applications/differential/mail/DifferentialInlineCommentMailView.php
+++ b/src/applications/differential/mail/DifferentialInlineCommentMailView.php
@@ -59,6 +59,9 @@
$comment = $inline->getComment();
$parent_phid = $comment->getReplyToCommentPHID();
+ $inline_object = $comment->newInlineCommentObject();
+ $document_engine_key = $inline_object->getDocumentEngineKey();
+
$is_last_inline = ($inline_key == $last_inline_key);
$context_text = null;
@@ -70,6 +73,17 @@
$context_text = $this->renderInline($parent, false, true);
$context_html = $this->renderInline($parent, true, true);
}
+ } else if ($document_engine_key !== null) {
+ // See T13513. If an inline was left on a rendered document, don't
+ // include the patch context. Document engines currently can not
+ // render to mail targets, and using the line numbers as raw source
+ // lines produces misleading context.
+
+ $patch_text = null;
+ $context_text = $this->renderPatch($comment, $patch_text, false);
+
+ $patch_html = null;
+ $context_html = $this->renderPatch($comment, $patch_html, true);
} else {
$patch_text = $this->getPatch($hunk_parser, $comment, false);
$context_text = $this->renderPatch($comment, $patch_text, false);
@@ -374,16 +388,24 @@
$is_html) {
if ($is_html) {
- $patch = $this->renderCodeBlock($patch);
+ if ($patch !== null) {
+ $patch = $this->renderCodeBlock($patch);
+ }
}
$header = $this->renderHeader($comment, $is_html, false);
- $patch = array(
- $header,
- "\n",
- $patch,
- );
+ if ($patch === null) {
+ $patch = array(
+ $header,
+ );
+ } else {
+ $patch = array(
+ $header,
+ "\n",
+ $patch,
+ );
+ }
if (!$is_html) {
$patch = implode('', $patch);

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 9, 8:45 PM (3 d, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8288271
Default Alt Text
D21242.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility