@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
Add colspan to Inline comment undo template
Summary: Broken by D2443.
Test Plan: Cancel non-empty inline comment.
Reviewers: epriestley, nh
Reviewed By: nh
CC: aran, Koolvin
Differential Revision: https://secure.phabricator.com/D2486
+22
-22
+15
-15
src/__celerity_resource_map__.php
+15
-15
src/__celerity_resource_map__.php
···
1461
1461
),
1462
1462
'javelin-dom' =>
1463
1463
array(
1464
-
'uri' => '/res/566888bc/rsrc/js/javelin/lib/DOM.js',
1464
+
'uri' => '/res/6d62f42d/rsrc/js/javelin/lib/DOM.js',
1465
1465
'type' => 'js',
1466
1466
'requires' =>
1467
1467
array(
···
1615
1615
),
1616
1616
'javelin-request' =>
1617
1617
array(
1618
-
'uri' => '/res/6ccc1d5a/rsrc/js/javelin/lib/Request.js',
1618
+
'uri' => '/res/1fe7cbad/rsrc/js/javelin/lib/Request.js',
1619
1619
'type' => 'js',
1620
1620
'requires' =>
1621
1621
array(
···
1630
1630
),
1631
1631
'javelin-resource' =>
1632
1632
array(
1633
-
'uri' => '/res/1ebc5a0d/rsrc/js/javelin/lib/Resource.js',
1633
+
'uri' => '/res/0058cd36/rsrc/js/javelin/lib/Resource.js',
1634
1634
'type' => 'js',
1635
1635
'requires' =>
1636
1636
array(
···
2594
2594
'uri' => '/res/pkg/5e68be89/diffusion.pkg.js',
2595
2595
'type' => 'js',
2596
2596
),
2597
-
'8a5de8a3' =>
2597
+
'5b44c659' =>
2598
2598
array(
2599
2599
'name' => 'javelin.pkg.js',
2600
2600
'symbols' =>
···
2610
2610
8 => 'javelin-json',
2611
2611
9 => 'javelin-uri',
2612
2612
),
2613
-
'uri' => '/res/pkg/8a5de8a3/javelin.pkg.js',
2613
+
'uri' => '/res/pkg/5b44c659/javelin.pkg.js',
2614
2614
'type' => 'js',
2615
2615
),
2616
2616
'7839ae2d' =>
···
2687
2687
'diffusion-commit-view-css' => 'c8ce2d88',
2688
2688
'diffusion-icons-css' => 'c8ce2d88',
2689
2689
'inline-comment-summary-css' => 'd9299c35',
2690
-
'javelin-behavior' => '8a5de8a3',
2690
+
'javelin-behavior' => '5b44c659',
2691
2691
'javelin-behavior-aphront-basic-tokenizer' => '97f65640',
2692
2692
'javelin-behavior-aphront-drag-and-drop' => '5ef7da0b',
2693
2693
'javelin-behavior-aphront-drag-and-drop-textarea' => '5ef7da0b',
···
2720
2720
'javelin-behavior-refresh-csrf' => '0c96375e',
2721
2721
'javelin-behavior-repository-crossreference' => '5ef7da0b',
2722
2722
'javelin-behavior-workflow' => '0c96375e',
2723
-
'javelin-dom' => '8a5de8a3',
2724
-
'javelin-event' => '8a5de8a3',
2725
-
'javelin-install' => '8a5de8a3',
2726
-
'javelin-json' => '8a5de8a3',
2723
+
'javelin-dom' => '5b44c659',
2724
+
'javelin-event' => '5b44c659',
2725
+
'javelin-install' => '5b44c659',
2726
+
'javelin-json' => '5b44c659',
2727
2727
'javelin-mask' => '0c96375e',
2728
-
'javelin-request' => '8a5de8a3',
2729
-
'javelin-stratcom' => '8a5de8a3',
2728
+
'javelin-request' => '5b44c659',
2729
+
'javelin-stratcom' => '5b44c659',
2730
2730
'javelin-tokenizer' => '97f65640',
2731
2731
'javelin-typeahead' => '97f65640',
2732
2732
'javelin-typeahead-normalizer' => '97f65640',
2733
2733
'javelin-typeahead-ondemand-source' => '97f65640',
2734
2734
'javelin-typeahead-preloaded-source' => '97f65640',
2735
2735
'javelin-typeahead-source' => '97f65640',
2736
-
'javelin-uri' => '8a5de8a3',
2737
-
'javelin-util' => '8a5de8a3',
2738
-
'javelin-vector' => '8a5de8a3',
2736
+
'javelin-uri' => '5b44c659',
2737
+
'javelin-util' => '5b44c659',
2738
+
'javelin-vector' => '5b44c659',
2739
2739
'javelin-workflow' => '0c96375e',
2740
2740
'maniphest-task-summary-css' => '7839ae2d',
2741
2741
'maniphest-transaction-detail-css' => '7839ae2d',
+7
-7
src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
+7
-7
src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
···
218
218
),
219
219
'Changes discarded. '.$link);
220
220
221
-
$content = '<th></th><td>'.$div.'</td>';
222
-
$empty = '<th></th><td></td>';
223
-
224
-
$left = array($content, $empty);
225
-
$right = array($empty, $content);
221
+
$template =
222
+
'<table><tr>'.
223
+
'<th></th><td>%s</td>'.
224
+
'<th></th><td colspan="2">%s</td>'.
225
+
'</tr></table>';
226
226
227
227
return array(
228
-
'l' => '<table><tr>'.implode('', $left).'</tr></table>',
229
-
'r' => '<table><tr>'.implode('', $right).'</tr></table>',
228
+
'l' => sprintf($template, $div, ''),
229
+
'r' => sprintf($template, '', $div),
230
230
);
231
231
}
232
232