mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/8558] Use only one variable and improve explain string

Browse Source 
PHPBB3-8558
This commit is contained in:
Oliver Schramm
2014-04-17 21:59:23 +02:00
parent 809054abfd
commit 59cdc26fb4
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/functions_messenger.php
View File

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