Skip to content
Snippets Groups Projects
Commit 766f36dd authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge pull request #924 from greezybacon/issue/text-email-ws


email: Don't sanitize and munge ws for emails

Reviewed-By: default avatarPeter Rotich <peter@osticket.com>
parents ae5e1382 571d065f
No related branches found
No related tags found
No related merge requests found
...@@ -161,8 +161,6 @@ class Mailer { ...@@ -161,8 +161,6 @@ class Mailer {
&& (!isset($options['reply-tag']) || $options['reply-tag'])) && (!isset($options['reply-tag']) || $options['reply-tag']))
$message = "<div style=\"display:none\" $message = "<div style=\"display:none\"
data-mid=\"$mid_token\">$tag<br/><br/></div>$message"; data-mid=\"$mid_token\">$tag<br/><br/></div>$message";
// Make sure nothing unsafe has creeped into the message
$message = Format::safe_html($message); //XXX??
$txtbody = rtrim(Format::html2text($message, 90, false)) $txtbody = rtrim(Format::html2text($message, 90, false))
. ($mid_token ? "\nRef-Mid: $mid_token\n" : ''); . ($mid_token ? "\nRef-Mid: $mid_token\n" : '');
$mime->setTXTBody($txtbody); $mime->setTXTBody($txtbody);
......
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