Page MenuHomePhabricator
Files F13968658

D15407.diff
No OneTemporary
Actions

D15407.diff
View Options

diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
@@ -636,6 +636,8 @@
}
}
+ $phids[] = $this->getActingAsPHID();
+
return $phids;
}
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -605,24 +605,27 @@
break;
}
- // If a transaction publishes an inline comment:
- //
- // - Don't show it if there are other kinds of transactions. The
- // rationale here is that application mail will make the presence
- // of inline comments obvious enough by including them prominently
- // in the body. We could change this in the future if the obviousness
- // needs to be increased.
- // - If there are only inline transactions, only show the first
- // transaction. The rationale is that seeing multiple "added an inline
- // comment" transactions is not useful.
-
if ($this->isInlineCommentTransaction()) {
+ $inlines = array();
+
+ // If there's a normal comment, we don't need to publish the inline
+ // transaction, since the normal comment covers things.
foreach ($xactions as $xaction) {
- if (!$xaction->isInlineCommentTransaction()) {
+ if ($xaction->isInlineCommentTransaction()) {
+ $inlines[] = $xaction;
+ continue;
+ }
+
+ // We found a normal comment, so hide this inline transaction.
+ if ($xaction->hasComment()) {
return true;
}
}
- return ($this !== head($xactions));
+
+ // If there are several inline comments, only publish the first one.
+ if ($this !== head($inlines)) {
+ return true;
+ }
}
return $this->shouldHide();

File Metadata

Mime Type
text/plain
Expires
Oct 17 2024, 10:34 PM (4 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6711185
Default Alt Text
D15407.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility