Merge branch '2021.03-rc' into copyright-2021

This commit is contained in:
Balázs Úr 2021-03-29 08:45:21 +02:00 committed by GitHub
commit befc2af504
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 41829 additions and 40547 deletions

View file

@ -95,8 +95,7 @@ class Invite extends BaseModule
$nmessage = $message;
}
$additional_headers = 'From: ' . $app->user['email'] . "\n"
. 'Sender: ' . DI::emailer()->getSiteEmailAddress() . "\n"
$additional_headers = 'From: "' . $app->user['email'] . '" <' . DI::emailer()->getSiteEmailAddress() . ">\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit';