@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
Differential - make sure not to return change type header if we're not top level
Summary: Followup to D6924. Fixes T3824.
Test Plan: deleted a file in a diff. was able to view file content without JS errors
Reviewers: epriestley
Reviewed By: epriestley
CC: Korvin, aran
Maniphest Tasks: T3824
Differential Revision: https://secure.phabricator.com/D6963
+16
-4
+2
-2
src/applications/differential/parser/DifferentialChangesetParser.php
+2
-2
src/applications/differential/parser/DifferentialChangesetParser.php
···
665
665
if ($changeset->getChangeType() == DifferentialChangeType::TYPE_DELETE &&
666
666
$old == array('unix:filemode' => '100644')) {
667
667
return false;
668
-
}
669
-
668
+
}
670
669
return true;
671
670
}
672
671
···
691
690
$renderer = $this->getRenderer()
692
691
->setChangeset($this->changeset)
693
692
->setRenderPropertyChangeHeader($render_pch)
693
+
->setIsTopLevel($this->isTopLevel)
694
694
->setOldRender($this->oldRender)
695
695
->setNewRender($this->newRender)
696
696
->setHunkStartLines($this->hunkStartLines)
+14
-2
src/applications/differential/render/DifferentialChangesetRenderer.php
+14
-2
src/applications/differential/render/DifferentialChangesetRenderer.php
···
6
6
private $changeset;
7
7
private $renderingReference;
8
8
private $renderPropertyChangeHeader;
9
+
private $isTopLevel;
9
10
private $hunkStartLines;
10
11
private $oldLines;
11
12
private $newLines;
···
236
237
return $this->renderPropertyChangeHeader;
237
238
}
238
239
240
+
public function setIsTopLevel($is) {
241
+
$this->isTopLevel = $is;
242
+
return $this;
243
+
}
244
+
private function getIsTopLevel() {
245
+
return $this->isTopLevel;
246
+
}
247
+
239
248
final public function renderChangesetTable($content) {
240
249
$props = null;
241
250
if ($this->shouldRenderPropertyChangeHeader()) {
242
251
$props = $this->renderPropertyChangeHeader();
243
252
}
244
253
245
-
$force = (!$content && !$props);
246
-
$notice = $this->renderChangeTypeHeader($force);
254
+
$notice = null;
255
+
if ($this->getIsTopLevel()) {
256
+
$force = (!$content && !$props);
257
+
$notice = $this->renderChangeTypeHeader($force);
258
+
}
247
259
248
260
$result = $notice.$props.$content;
249
261