mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-21 09:01:29 +02:00
[ticket/8558] Do string concatenation only once and do htmlspecialchars
PHPBB3-8558
This commit is contained in:
@@ -486,14 +486,16 @@ class messenger
|
|||||||
$use_queue = true;
|
$use_queue = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$board_contact = '"' . mail_encode(htmlspecialchars($config['sitename'])) . '" <' . $config['board_contact'] . '>';
|
||||||
|
|
||||||
if (empty($this->replyto))
|
if (empty($this->replyto))
|
||||||
{
|
{
|
||||||
$this->replyto = '"' . $config['sitename'] . '" <' . $config['board_contact'] . '>';
|
$this->replyto = $board_contact;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($this->from))
|
if (empty($this->from))
|
||||||
{
|
{
|
||||||
$this->from = '"' . $config['sitename'] . '" <' . $config['board_contact'] . '>';
|
$this->from = $board_contact;
|
||||||
}
|
}
|
||||||
|
|
||||||
$encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol;
|
$encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol;
|
||||||
|
Reference in New Issue
Block a user