Page MenuHomePhabricator
Files F13977192

D8217.diff
No OneTemporary
Actions

D8217.diff
View Options

Index: src/applications/feed/story/PhabricatorFeedStoryDifferential.php
===================================================================
--- src/applications/feed/story/PhabricatorFeedStoryDifferential.php
+++ src/applications/feed/story/PhabricatorFeedStoryDifferential.php
@@ -319,28 +319,41 @@
}
// Roughly render inlines into the comment.
- $comment_id = $data->getValue('temporaryCommentID');
- if ($comment_id) {
- $inlines = id(new DifferentialInlineCommentQuery())
- ->withCommentIDs(array($comment_id))
+ $xaction_phids = $data->getValue('temporaryTransactionPHIDs');
+ if ($xaction_phids) {
+ $inlines = id(new DifferentialTransactionQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withPHIDs($xaction_phids)
+ ->needComments(true)
+ ->withTransactionTypes(
+ array(
+ DifferentialTransaction::TYPE_INLINE,
+ ))
->execute();
if ($inlines) {
$title .= "\n\n";
$title .= pht('Inline Comments');
$title .= "\n";
- $changeset_ids = mpull($inlines, 'getChangesetID');
+
+ $changeset_ids = array();
+ foreach ($inlines as $inline) {
+ $changeset_ids[] = $inline->getComment()->getChangesetID();
+ }
+
$changesets = id(new DifferentialChangeset())->loadAllWhere(
'id IN (%Ld)',
$changeset_ids);
+
foreach ($inlines as $inline) {
- $changeset = idx($changesets, $inline->getChangesetID());
+ $comment = $inline->getComment();
+ $changeset = idx($changesets, $comment->getChangesetID());
if (!$changeset) {
continue;
}
$filename = $changeset->getDisplayFilename();
- $linenumber = $inline->getLineNumber();
- $inline_text = $engine->markupText($inline->getContent());
+ $linenumber = $comment->getLineNumber();
+ $inline_text = $engine->markupText($comment->getContent());
$inline_text = rtrim($inline_text);
$title .= "{$filename}:{$linenumber} {$inline_text}\n";

File Metadata

Mime Type
text/plain
Expires
Oct 19 2024, 5:34 PM (4 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6733196
Default Alt Text
D8217.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility