Page MenuHomestyx hydra
Files F1457632

No OneTemporary
Actions

View Options

diff --git a/src/applications/differential/query/DifferentialTransactionQuery.php b/src/applications/differential/query/DifferentialTransactionQuery.php
index 40a2d30ce8..e8a7316ea3 100644
--- a/src/applications/differential/query/DifferentialTransactionQuery.php
+++ b/src/applications/differential/query/DifferentialTransactionQuery.php
@@ -1,44 +1,55 @@
<?php
final class DifferentialTransactionQuery
extends PhabricatorApplicationTransactionQuery {
public function getTemplateApplicationTransaction() {
return new DifferentialTransaction();
}
public static function loadUnsubmittedInlineComments(
PhabricatorUser $viewer,
DifferentialRevision $revision) {
$inlines = id(new DifferentialDiffInlineCommentQuery())
->setViewer($viewer)
->withRevisionPHIDs(array($revision->getPHID()))
->withAuthorPHIDs(array($viewer->getPHID()))
->withHasTransaction(false)
->withIsDeleted(false)
->needReplyToComments(true)
->execute();
foreach ($inlines as $key => $inline) {
$inlines[$key] = DifferentialInlineComment::newFromModernComment(
$inline);
}
PhabricatorInlineComment::loadAndAttachVersionedDrafts(
$viewer,
$inlines);
// Don't count void inlines when considering draft state.
foreach ($inlines as $key => $inline) {
if ($inline->isVoidComment($viewer)) {
unset($inlines[$key]);
+ continue;
+ }
+
+ // For other inlines: if they have a nonempty draft state, set their
+ // content to the draft state content. We want to submit the comment
+ // as it is currently shown to the user, not as it was stored the last
+ // time they clicked "Save".
+
+ $draft_content = $inline->getContentForEdit($viewer);
+ if (strlen($draft_content)) {
+ $inline->setContent($draft_content);
}
}
$inlines = mpull($inlines, 'getStorageObject');
return $inlines;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 15, 11:50 PM (3 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
338558
Default Alt Text
(1 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)