diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-09-16 19:38:36 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-09-16 19:38:36 +0100 |
| commit | e808cb5be28ce4e077f19cf545d36fc7f9742965 (patch) | |
| tree | 542e6f0fb07f57777630f7e9fa2315d32fb6a333 | |
| parent | a779c78fabd49fcacfb2a92312e25ac5b47b93b5 (diff) | |
| download | webtrees-e808cb5be28ce4e077f19cf545d36fc7f9742965.tar.gz webtrees-e808cb5be28ce4e077f19cf545d36fc7f9742965.tar.bz2 webtrees-e808cb5be28ce4e077f19cf545d36fc7f9742965.zip | |
Simplify conversion to MSDOS line endings
| -rw-r--r-- | app/Services/MailService.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/Services/MailService.php b/app/Services/MailService.php index c2b96267ec..37f4e6d135 100644 --- a/app/Services/MailService.php +++ b/app/Services/MailService.php @@ -27,6 +27,7 @@ use Swift_NullTransport; use Swift_SendmailTransport; use Swift_SmtpTransport; use Swift_Transport; +use function str_replace; /** * Send mail messages. @@ -49,8 +50,9 @@ class MailService public function send(UserInterface $from, UserInterface $to, UserInterface $reply_to, string $subject, string $message_text, string $message_html): bool { try { - $message_text = preg_replace('/\r?\n/', "\r\n", $message_text); - $message_html = preg_replace('/\r?\n/', "\r\n", $message_html); + // Mail needs MSDOS line endings + $message_text = str_replace("\n", "\r\n", $message_text); + $message_html = str_replace("\n", "\r\n", $message_html); $message = (new Swift_Message()) ->setSubject($subject) |