diff options
| -rw-r--r-- | includes/mail.inc | 1 | ||||
| -rw-r--r-- | modules/system/mail.sending.inc | 4 | ||||
| -rw-r--r-- | sites/default/default.settings.php | 9 |
3 files changed, 4 insertions, 10 deletions
diff --git a/includes/mail.inc b/includes/mail.inc index 92de9bf6d..6b2d3c229 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -8,6 +8,7 @@ /** * Auto-detect appropriate line endings for e-mails. + * * $conf['mail_line_endings'] will override this setting. */ define('MAIL_LINE_ENDINGS', isset($_SERVER['WINDIR']) || strpos($_SERVER['SERVER_SOFTWARE'], 'Win32') !== FALSE ? "\r\n" : "\n"); diff --git a/modules/system/mail.sending.inc b/modules/system/mail.sending.inc index c0f0738ad..f80b6953c 100644 --- a/modules/system/mail.sending.inc +++ b/modules/system/mail.sending.inc @@ -50,7 +50,9 @@ class DefaultMailSystem implements MailSystemInterface { $message['to'], mime_header_encode($message['subject']), // Note: e-mail uses CRLF for line-endings. PHP's API requires LF - // on Unix and CRLF on Windows. See mail_line_endings in settings.php. + // on Unix and CRLF on Windows. Drupal automatically guesses the + // line-ending format appropriate for your system. If you need to + // override this, adjust $conf['mail_line_endings'] in settings.php. preg_replace('@\r?\n@', $line_endings, $message['body']), // For headers, PHP's API suggests that we use CRLF normally, // but some MTAs incorrectly replace LF with CRLF. See #234403. diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index e869027b7..b8b4dbbe7 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -167,15 +167,6 @@ $db_prefix = ''; $update_free_access = FALSE; /** - * Line endings for e-mail messages - * - * Drupal automatically guesses the line-ending format appropriate for your - * system. If you need to override this, uncomment the statement below and set - * it to the line-ending string of your choice. - */ -# $conf['mail_line_endings'] = "\r\n"; - -/** * Base URL (optional). * * If you are experiencing issues with different site domains, |