diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-03-15 11:59:37 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-03-15 11:59:37 +0000 |
| commit | 637ec9359cb3ef8e5e16008b800d5633c4fe7890 (patch) | |
| tree | 4206ba2f7e027ad2d21996fcb072c30e53a9a210 /includes/mail.inc | |
| parent | 66c79ee7922cc9ca4f5cdaeb0222c392e8b00571 (diff) | |
| download | brdo-637ec9359cb3ef8e5e16008b800d5633c4fe7890.tar.gz brdo-637ec9359cb3ef8e5e16008b800d5633c4fe7890.tar.bz2 | |
- Patch #234403 by alienbrain: drupal_mail_send() should use CRLFs instead of LFs in e-mail headers.
Diffstat (limited to 'includes/mail.inc')
| -rw-r--r-- | includes/mail.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/mail.inc b/includes/mail.inc index 64b9b9363..3d6bf659a 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -184,10 +184,12 @@ function drupal_mail_send($message) { return mail( $message['to'], mime_header_encode($message['subject']), - // Note: e-mail uses CRLF for line-endings, but PHP's API requires LF. + // Note: e-mail uses CRLF for line-endings, but PHP's API requires LF + // for the message body. // They will appear correctly in the actual e-mail that is sent. str_replace("\r", '', $message['body']), - join("\n", $mimeheaders) + // For headers, PHP's API requires that we use CRLF normally. + join("\r\n", $mimeheaders) ); } } |