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

Merge pull request #442 from greezybacon/issue/202


Use Unix style line-endings for Windoze mail()

Reviewed-By: default avatarPeter Rotich <peter@osticket.com>
parents 8db53919 94c7f97f
No related branches found
No related tags found
No related merge requests found
......@@ -148,7 +148,19 @@ class Mailer {
}
}
$mime = new Mail_mime();
// The Suhosin patch will muck up the line endings in some
// cases
//
// References:
// https://github.com/osTicket/osTicket-1.8/issues/202
// http://pear.php.net/bugs/bug.php?id=12032
// http://us2.php.net/manual/en/function.mail.php#97680
if ((extension_loaded('suhosin') || constant("SUHOSIN_PATCH"))
&& !$this->getSMTPInfo())
$mime = new Mail_mime("\n");
else
// Use defaults
$mime = new Mail_mime();
// If the message is not explicitly declared to be a text message,
// then assume that it needs html processing to create a valid text
......
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