@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 some easy phutil_render_tag()
Summary:
- Grepped for phutil_render_tag().
- Fixed some easy ones.
Test Plan:
- Browsed around; site didn't seem more broken than it was before.
Reviewers: vrana
Reviewed By: vrana
CC: aran
Differential Revision: https://secure.phabricator.com/D4638
+82
-75
+2
-4
src/applications/conpherence/controller/ConpherenceController.php
+2
-4
src/applications/conpherence/controller/ConpherenceController.php
···
166
166
}
167
167
168
168
private function getNoConpherencesBlock() {
169
-
170
-
return phutil_render_tag(
169
+
return phutil_tag(
171
170
'div',
172
171
array(
173
172
'class' => 'no-conpherences-menu-item'
174
173
),
175
-
pht('No more conpherences.')
176
-
);
174
+
pht('No more conpherences.'));
177
175
}
178
176
179
177
public function buildApplicationMenu() {
+32
-34
src/applications/conpherence/controller/ConpherenceListController.php
+32
-34
src/applications/conpherence/controller/ConpherenceListController.php
···
69
69
70
70
private function renderEmptyMainPane() {
71
71
$this->initJavelinBehaviors();
72
-
return phutil_render_tag(
72
+
return phutil_tag(
73
73
'div',
74
74
array(
75
75
'id' => 'conpherence-main-pane'
76
76
),
77
-
phutil_render_tag(
78
-
'div',
79
-
array(
80
-
'class' => 'conpherence-header-pane',
81
-
'id' => 'conpherence-header-pane',
82
-
),
83
-
''
84
-
).
85
-
phutil_render_tag(
86
-
'div',
87
-
array(
88
-
'class' => 'conpherence-widget-pane',
89
-
'id' => 'conpherence-widget-pane'
90
-
),
91
-
''
92
-
).
93
-
javelin_render_tag(
94
-
'div',
95
-
array(
96
-
'class' => 'conpherence-message-pane',
97
-
'id' => 'conpherence-message-pane'
98
-
),
99
-
phutil_render_tag(
77
+
array(
78
+
phutil_tag(
100
79
'div',
101
80
array(
102
-
'class' => 'conpherence-messages',
103
-
'id' => 'conpherence-messages'
81
+
'class' => 'conpherence-header-pane',
82
+
'id' => 'conpherence-header-pane',
104
83
),
105
-
''
106
-
).
107
-
phutil_render_tag(
84
+
''),
85
+
phutil_tag(
86
+
'div',
87
+
array(
88
+
'class' => 'conpherence-widget-pane',
89
+
'id' => 'conpherence-widget-pane'
90
+
),
91
+
''),
92
+
phutil_tag(
108
93
'div',
109
94
array(
110
-
'id' => 'conpherence-form'
95
+
'class' => 'conpherence-message-pane',
96
+
'id' => 'conpherence-message-pane'
111
97
),
112
-
''
113
-
)
114
-
)
115
-
);
98
+
array(
99
+
phutil_tag(
100
+
'div',
101
+
array(
102
+
'class' => 'conpherence-messages',
103
+
'id' => 'conpherence-messages'
104
+
),
105
+
''),
106
+
phutil_tag(
107
+
'div',
108
+
array(
109
+
'id' => 'conpherence-form'
110
+
),
111
+
''),
112
+
)),
113
+
));
116
114
}
117
115
118
116
+4
-4
src/applications/conpherence/controller/ConpherenceNewController.php
+4
-4
src/applications/conpherence/controller/ConpherenceNewController.php
···
92
92
->setTitle('Success')
93
93
->addCancelButton('#', 'Okay')
94
94
->appendChild(
95
-
phutil_render_tag('p',
96
-
array(),
97
-
pht('Message sent successfully.')
98
-
)
95
+
phutil_tag(
96
+
'p',
97
+
array(),
98
+
pht('Message sent successfully.'))
99
99
);
100
100
$response = id(new AphrontDialogResponse())
101
101
->setDialog($dialog);
+1
-1
src/applications/conpherence/controller/ConpherenceUpdateController.php
+1
-1
src/applications/conpherence/controller/ConpherenceUpdateController.php
+10
-10
src/applications/conpherence/view/ConpherenceMenuItemView.php
+10
-10
src/applications/conpherence/view/ConpherenceMenuItemView.php
···
85
85
protected function getTagContent() {
86
86
$image = null;
87
87
if ($this->imageURI) {
88
-
$image = phutil_render_tag(
88
+
$image = phutil_tag(
89
89
'span',
90
90
array(
91
91
'class' => 'conpherence-menu-item-image',
···
95
95
}
96
96
$title = null;
97
97
if ($this->title) {
98
-
$title = phutil_render_tag(
98
+
$title = phutil_tag(
99
99
'span',
100
100
array(
101
101
'class' => 'conpherence-menu-item-title',
102
102
),
103
-
phutil_escape_html($this->title));
103
+
$this->title);
104
104
}
105
105
$subtitle = null;
106
106
if ($this->subtitle) {
107
-
$subtitle = phutil_render_tag(
107
+
$subtitle = phutil_tag(
108
108
'span',
109
109
array(
110
110
'class' => 'conpherence-menu-item-subtitle',
111
111
),
112
-
phutil_escape_html($this->subtitle));
112
+
$this->subtitle);
113
113
}
114
114
$message = null;
115
115
if ($this->messageText) {
116
-
$message = phutil_render_tag(
116
+
$message = phutil_tag(
117
117
'span',
118
118
array(
119
119
'class' => 'conpherence-menu-item-message-text'
120
120
),
121
-
phutil_escape_html($this->messageText));
121
+
$this->messageText);
122
122
}
123
123
$epoch = null;
124
124
if ($this->epoch) {
125
-
$epoch = phutil_render_tag(
125
+
$epoch = phutil_tag(
126
126
'span',
127
127
array(
128
128
'class' => 'conpherence-menu-item-date',
···
131
131
}
132
132
$unread_count = null;
133
133
if ($this->unreadCount) {
134
-
$unread_count = phutil_render_tag(
134
+
$unread_count = phutil_tag(
135
135
'span',
136
136
array(
137
137
'class' => 'conpherence-menu-item-unread-count'
138
138
),
139
-
$this->unreadCount);
139
+
(int)$this->unreadCount);
140
140
}
141
141
142
142
return $image.$title.$subtitle.$message.$epoch.$unread_count;
+2
-3
src/applications/conpherence/view/ConpherenceTransactionView.php
+2
-3
src/applications/conpherence/view/ConpherenceTransactionView.php
···
47
47
case ConpherenceTransactionType::TYPE_PICTURE:
48
48
$img = $transaction->getHandle($transaction->getNewValue());
49
49
$content = $transaction->getTitle() .
50
-
phutil_render_tag(
50
+
phutil_tag(
51
51
'img',
52
52
array(
53
53
'src' => $img->getImageURI()
54
-
)
55
-
);
54
+
));
56
55
$transaction_view->addClass('conpherence-edited');
57
56
break;
58
57
case ConpherenceTransactionType::TYPE_PARTICIPANTS:
+2
-2
src/applications/countdown/controller/PhabricatorCountdownViewController.php
+2
-2
src/applications/countdown/controller/PhabricatorCountdownViewController.php
···
23
23
24
24
$chrome_visible = $request->getBool('chrome', true);
25
25
$chrome_new = $chrome_visible ? false : null;
26
-
$chrome_link = phutil_render_tag(
26
+
$chrome_link = phutil_tag(
27
27
'a',
28
28
array(
29
29
'href' => $request->getRequestURI()->alter('chrome', $chrome_new),
30
30
'class' => 'phabricator-timer-chrome-link',
31
31
),
32
-
$chrome_visible ? 'Disable Chrome' : 'Enable Chrome');
32
+
$chrome_visible ? pht('Disable Chrome') : pht('Enable Chrome'));
33
33
34
34
$container = celerity_generate_unique_node_id();
35
35
$content =
+3
-3
src/applications/meta/view/PhabricatorApplicationLaunchView.php
+3
-3
src/applications/meta/view/PhabricatorApplicationLaunchView.php
···
39
39
$application->getName());
40
40
41
41
if ($application->isBeta()) {
42
-
$content[] = phutil_render_tag(
42
+
$content[] = phutil_tag(
43
43
'span',
44
44
array(
45
45
'class' => 'phabricator-application-beta',
···
97
97
$classes[] = 'phabricator-application-create-icon';
98
98
$classes[] = 'sprite-icon';
99
99
$classes[] = 'action-new-grey';
100
-
$plus_icon = phutil_render_tag(
100
+
$plus_icon = phutil_tag(
101
101
'span',
102
102
array(
103
103
'class' => implode(' ', $classes),
104
104
));
105
105
106
-
$create_button = phutil_render_tag(
106
+
$create_button = phutil_tag(
107
107
'a',
108
108
array(
109
109
'href' => $application->getQuickCreateURI(),
+2
-2
src/applications/pholio/view/PholioMockImagesView.php
+2
-2
src/applications/pholio/view/PholioMockImagesView.php
···
21
21
"phid=%s",
22
22
$image->getFilePHID());
23
23
24
-
$image_tag = phutil_render_tag(
24
+
$image_tag = phutil_tag(
25
25
'img',
26
26
array(
27
27
'src' => $file->getBestURI(),
···
29
29
),
30
30
'');
31
31
32
-
return phutil_render_tag(
32
+
return phutil_tag(
33
33
'div',
34
34
array(
35
35
'class' => 'pholio-mock-image-container',
+8
-2
src/applications/repository/controller/PhabricatorRepositoryDeleteController.php
+8
-2
src/applications/repository/controller/PhabricatorRepositoryDeleteController.php
···
28
28
phutil_escape_html($repository->getCallsign());
29
29
$text_2 = pht('Repositories touch many objects and as such deletes are '.
30
30
'prohibitively expensive to run from the web UI.');
31
-
$body = phutil_render_tag(
31
+
$body = phutil_tag(
32
32
'div',
33
33
array(
34
34
'class' => 'phabricator-remarkup',
35
35
),
36
-
'<p>'.$text_1.'</p><p><tt>'.$command.'</tt></p><p>'.$text_2.'</p>');
36
+
array(
37
+
phutil_tag('p', array(), $text_1),
38
+
phutil_tag('p', array(),
39
+
phutil_tag('tt', array(), $command)),
40
+
phutil_tag('p', array(), $text_2),
41
+
));
42
+
37
43
$dialog
38
44
->setUser($request->getUser())
39
45
->setTitle(pht('Really want to delete the repository?'))
+5
-3
src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
+5
-3
src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
···
68
68
$tail = null;
69
69
}
70
70
71
-
$lines = phutil_escape_html($lines);
72
71
if ($href) {
73
-
$lines = phutil_render_tag(
72
+
$lines = phutil_tag(
74
73
'a',
75
74
array(
76
75
'href' => $href,
77
76
'target' => $target,
78
77
'class' => 'num',
79
78
),
80
-
$lines.$tail);
79
+
array(
80
+
$lines,
81
+
$tail,
82
+
));
81
83
}
82
84
83
85
$where = idx($item, 'where');
+1
-1
src/infrastructure/markup/rule/PhabricatorRemarkupRuleMeme.php
+1
-1
src/infrastructure/markup/rule/PhabricatorRemarkupRuleMeme.php
+7
-3
src/view/control/AphrontTableView.php
+7
-3
src/view/control/AphrontTableView.php
···
188
188
),
189
189
'');
190
190
191
-
$header = phutil_render_tag(
191
+
$header = phutil_tag(
192
192
'a',
193
193
array(
194
194
'href' => $this->sortURI->alter($this->sortParam, $sort_value),
195
195
'class' => 'aphront-table-view-sort-link',
196
196
),
197
-
$header.' '.$sort_glyph);
197
+
array(
198
+
$header,
199
+
' ',
200
+
$sort_glyph,
201
+
));
198
202
}
199
203
200
204
if ($classes) {
···
204
208
}
205
209
206
210
if ($short_headers[$col_num] !== null) {
207
-
$header_nodevice = phutil_render_tag(
211
+
$header_nodevice = phutil_tag(
208
212
'span',
209
213
array(
210
214
'class' => 'aphront-table-view-nodevice',
+1
-1
src/view/control/PhabricatorObjectSelectorDialog.php
+1
-1
src/view/control/PhabricatorObjectSelectorDialog.php
+2
-2
src/view/page/PhabricatorStandardPageView.php
+2
-2
src/view/page/PhabricatorStandardPageView.php
···
249
249
if ($user && $user->getIsAdmin()) {
250
250
$open = PhabricatorSetupCheck::getOpenSetupIssueCount();
251
251
if ($open) {
252
-
$setup_warning = phutil_render_tag(
252
+
$setup_warning = phutil_tag(
253
253
'div',
254
254
array(
255
255
'class' => 'setup-warning-callout',
256
256
),
257
-
phutil_render_tag(
257
+
phutil_tag(
258
258
'a',
259
259
array(
260
260
'href' => '/config/issue/',