@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 an issue where inlines appear in the wrong place in one-up views
Summary: Ref T2009. Unchanged lines should always go above inlines; we get nonsense results otherwise.
Test Plan: Inline now shows in correct place in unified view.
Reviewers: btrahan
Reviewed By: btrahan
Subscribers: epriestley
Maniphest Tasks: T2009
Differential Revision: https://secure.phabricator.com/D11987
+8
-1
+8
-1
src/applications/differential/render/DifferentialChangesetRenderer.php
+8
-1
src/applications/differential/render/DifferentialChangesetRenderer.php
···
518
518
$out[] = $old_buf;
519
519
$old_buf = array();
520
520
}
521
-
$new_buf[] = $primitive;
521
+
if (!$primitive['htype']) {
522
+
// If this line is the same in both versions of the file, put it in
523
+
// the old line buffer. This makes sure inlines on old, unchanged
524
+
// lines end up in the right place.
525
+
$old_buf[] = $primitive;
526
+
} else {
527
+
$new_buf[] = $primitive;
528
+
}
522
529
} else if ($type == 'context' || $type == 'no-context') {
523
530
$out[] = $old_buf;
524
531
$out[] = $new_buf;