Commit ec732a63 authored by webchick's avatar webchick

#239825 follow-up: Adjusting comments.

parent 3b427fae
......@@ -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");
......
......@@ -50,7 +50,9 @@ public function mail(array $message) {
$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.
......
......@@ -166,15 +166,6 @@
*/
$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).
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment