@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 Diffusion blame columns when disabling blame
Summary:
Fixes T10385. Two issues:
- `$show_blame` and `$show_color` were improperly swapped.
- Code to hide these columns got dropped somewhere, probably in my recent-ish rewrite.
Test Plan:
- Showed/hid blame.
- Showed/hid colors.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T10385
Differential Revision: https://secure.phabricator.com/D15528
+22
-20
+22
-20
src/applications/diffusion/controller/DiffusionBrowseController.php
+22
-20
src/applications/diffusion/controller/DiffusionBrowseController.php
···
995
995
array $lines,
996
996
array $blame_list,
997
997
array $blame_commits,
998
-
$show_color,
999
-
$show_blame) {
998
+
$show_blame,
999
+
$show_color) {
1000
1000
1001
1001
$request = $this->getRequest();
1002
1002
$viewer = $this->getViewer();
···
1233
1233
"\xC2\xAB");
1234
1234
}
1235
1235
1236
-
$row[] = phutil_tag(
1237
-
'th',
1238
-
array(
1239
-
'class' => 'diffusion-blame-link',
1240
-
),
1241
-
$before_link);
1236
+
if ($show_blame) {
1237
+
$row[] = phutil_tag(
1238
+
'th',
1239
+
array(
1240
+
'class' => 'diffusion-blame-link',
1241
+
),
1242
+
$before_link);
1242
1243
1243
-
$object_links = array();
1244
-
$object_links[] = $commit_link;
1245
-
if ($revision_link) {
1246
-
$object_links[] = phutil_tag('span', array(), '/');
1247
-
$object_links[] = $revision_link;
1248
-
}
1244
+
$object_links = array();
1245
+
$object_links[] = $commit_link;
1246
+
if ($revision_link) {
1247
+
$object_links[] = phutil_tag('span', array(), '/');
1248
+
$object_links[] = $revision_link;
1249
+
}
1249
1250
1250
-
$row[] = phutil_tag(
1251
-
'th',
1252
-
array(
1253
-
'class' => 'diffusion-rev-link',
1254
-
),
1255
-
$object_links);
1251
+
$row[] = phutil_tag(
1252
+
'th',
1253
+
array(
1254
+
'class' => 'diffusion-rev-link',
1255
+
),
1256
+
$object_links);
1257
+
}
1256
1258
1257
1259
$line_link = phutil_tag(
1258
1260
'a',