makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 10:18:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/8558] Do string concatenation only once and do htmlspecialchars
  [ticket/8558] Add display name in emails from board
This commit is contained in:
Nils Adermann 2014-05-02 12:43:20 +02:00
commit 367abd2297
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/functions_messenger.php
View file

@ -484,14 +484,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['board_contact'] . '>'; $this->replyto = $board_contact;
} }
if (empty($this->from)) if (empty($this->from))
{ {
$this->from = '<' . $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;