@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
Only add the Mail "STAMPS" body section if there are stamps
Summary: Ref T13053. Some mail (like push notification mail) doesn't currently generate any stamps. Drop this section if there aren't any stamps on the mail.
Test Plan: Will check push mail in production.
Maniphest Tasks: T13053
Differential Revision: https://secure.phabricator.com/D19028
+21
-20
+21
-20
src/applications/metamta/replyhandler/PhabricatorMailTarget.php
+21
-20
src/applications/metamta/replyhandler/PhabricatorMailTarget.php
···
66
66
67
67
if ($show_stamps) {
68
68
$stamps = $mail->getMailStamps();
69
+
if ($stamps) {
70
+
$body .= "\n";
71
+
$body .= pht('STAMPS');
72
+
$body .= "\n";
73
+
$body .= implode(' ', $stamps);
74
+
$body .= "\n";
69
75
70
-
$body .= "\n";
71
-
$body .= pht('STAMPS');
72
-
$body .= "\n";
73
-
$body .= implode(' ', $stamps);
74
-
$body .= "\n";
75
-
76
-
if ($has_html) {
77
-
$html = array();
78
-
$html[] = phutil_tag('strong', array(), pht('STAMPS'));
79
-
$html[] = phutil_tag('br');
80
-
$html[] = phutil_tag(
81
-
'span',
82
-
array(
83
-
'style' => 'font-size: smaller; color: #92969D',
84
-
),
85
-
phutil_implode_html(' ', $stamps));
86
-
$html[] = phutil_tag('br');
87
-
$html[] = phutil_tag('br');
88
-
$html = phutil_tag('div', array(), $html);
89
-
$html_body .= hsprintf('%s', $html);
76
+
if ($has_html) {
77
+
$html = array();
78
+
$html[] = phutil_tag('strong', array(), pht('STAMPS'));
79
+
$html[] = phutil_tag('br');
80
+
$html[] = phutil_tag(
81
+
'span',
82
+
array(
83
+
'style' => 'font-size: smaller; color: #92969D',
84
+
),
85
+
phutil_implode_html(' ', $stamps));
86
+
$html[] = phutil_tag('br');
87
+
$html[] = phutil_tag('br');
88
+
$html = phutil_tag('div', array(), $html);
89
+
$html_body .= hsprintf('%s', $html);
90
+
}
90
91
}
91
92
}
92
93