diff options
| author | Mario <mario@mariovavti.com> | 2019-03-18 09:35:53 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-03-18 09:35:53 +0100 |
| commit | 51156d058232969d55032f045859e46bb3a09162 (patch) | |
| tree | 4f2dea61bdc49be73de4ae00fc4e22937361df3e /include/network.php | |
| parent | e28bde6ccdb03b370df1dbc8654d69c905b8a235 (diff) | |
| parent | ea9925f489602529891c0ed468cf35117e7ef454 (diff) | |
| download | volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.tar.gz volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.tar.bz2 volse-hubzilla-51156d058232969d55032f045859e46bb3a09162.zip | |
Merge branch 'dev' into 'dev'
misc fixes
See merge request hubzilla/core!1558
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/network.php b/include/network.php index 3e8134a32..c754625cd 100644 --- a/include/network.php +++ b/include/network.php @@ -895,7 +895,7 @@ function email_header_encode($in_str, $charset = 'UTF-8', $header = 'Subject') { // define start delimimter, end delimiter and spacer $end = "?="; $start = "=?" . $charset . "?B?"; - $spacer = $end . "\r\n " . $start; + $spacer = $end . PHP_EOL . " " . $start; // determine length of encoded text within chunks // and ensure length is even @@ -1799,8 +1799,8 @@ function z_mail($params) { $messageHeader = $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>\n" . - "Reply-To: $fromName <{$params['replyTo']}>\n" . + "From: $fromName <{$params['fromEmail']}>" . PHP_EOL . + "Reply-To: $fromName <{$params['replyTo']}>" . PHP_EOL . "Content-Type: text/plain; charset=UTF-8"; // send the message |