1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

[ticket/8558] Add display name in emails from board

PHPBB3-8558
This commit is contained in:
Markus Stenudd
2013-11-30 16:01:26 +01:00
committed by Oliver Schramm
parent 0da5e3bee9
commit 40c685e6fc
3 changed files with 19 additions and 2 deletions

View File

@@ -486,12 +486,26 @@ class messenger
if (empty($this->replyto))
{
$this->replyto = '<' . $config['board_contact'] . '>';
if ($config['board_contact_name'])
{
$this->replyto = '"' . mail_encode($config['board_contact_name']) . '" <' . $config['board_contact'] . '>';
}
else
{
$this->replyto = '<' . $config['board_contact'] . '>';
}
}
if (empty($this->from))
{
$this->from = '<' . $config['board_contact'] . '>';
if ($config['board_contact_name'])
{
$this->from = '"' . mail_encode($config['board_contact_name']) . '" <' . $config['board_contact'] . '>';
}
else
{
$this->from = '<' . $config['board_contact'] . '>';
}
}
$encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol;