Skip to content
Snippets Groups Projects
Commit bd4e4c94 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

add linebreaks and escaping in digest HTML mails FS#2606

this is a temporary and somewhat ugly fix. digest subscriptions should
make use of the inline format just as the 'every' subscriptions do.
But it makes sense to implement it correctly in the subscription branch
instead and not introduce new code in the RC.
parent e7ebc158
No related branches found
No related tags found
No related merge requests found
......@@ -396,12 +396,14 @@ function subscription_send($subscriber_mail, $replaces, $subject, $id, $template
$text = rawLocale($template);
$trep = array_merge($replaces, array('PAGE' => $id));
$hrep = $trep;
$hrep['DIFF'] = nl2br(htmlspecialchars($hrep['DIFF']));
$subject = $lang['mail_' . $subject] . ' ' . $id;
$mail = new Mailer();
$mail->bcc($subscriber_mail);
$mail->subject($subject);
$mail->setBody($text,$trep);
$mail->setBody($text,$trep,$hrep);
$mail->from($conf['mailfromnobody']);
$mail->setHeader(
'List-Unsubscribe',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment