@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix a mistakenly translated query from D6262
Summary: Ref T2222. I didn't translate this query properly; reproduce the original.
Test Plan: When viewing a revision with non-draft inline comments by a user other than the viewer, the inline comments now appear on the changesets themselves.
Reviewers: kawakami, btrahan, garoevans
Reviewed By: garoevans
CC: aran, mbishopim3
Maniphest Tasks: T2222
Differential Revision: https://secure.phabricator.com/D6281
+9
-9
+1
-1
src/applications/differential/controller/DifferentialChangesetViewController.php
+1
-1
src/applications/differential/controller/DifferentialChangesetViewController.php
+8
-8
src/applications/differential/query/DifferentialInlineCommentQuery.php
+8
-8
src/applications/differential/query/DifferentialInlineCommentQuery.php
···
11
11
private $ids;
12
12
private $commentIDs;
13
13
14
-
private $authorAndChangesetIDs;
14
+
private $viewerAndChangesetIDs;
15
15
private $draftComments;
16
16
private $draftsByAuthors;
17
17
···
35
35
return $this;
36
36
}
37
37
38
-
public function withAuthorAndChangesetIDs($author_phid, array $ids) {
39
-
$this->authorAndChangesetIDs = array($author_phid, $ids);
38
+
public function withViewerAndChangesetIDs($author_phid, array $ids) {
39
+
$this->viewerAndChangesetIDs = array($author_phid, $ids);
40
40
return $this;
41
41
}
42
42
···
98
98
$this->commentIDs);
99
99
}
100
100
101
-
if ($this->authorAndChangesetIDs) {
102
-
list($phid, $ids) = $this->authorAndChangesetIDs;
101
+
if ($this->viewerAndChangesetIDs) {
102
+
list($phid, $ids) = $this->viewerAndChangesetIDs;
103
103
$where[] = qsprintf(
104
104
$conn_r,
105
-
'authorPHID = %s AND changesetID IN (%Ld)',
106
-
$phid,
107
-
$ids);
105
+
'changesetID IN (%Ld) AND (authorPHID = %s OR commentID IS NOT NULL)',
106
+
$ids,
107
+
$phid);
108
108
}
109
109
110
110
if ($this->draftComments) {