diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-16 17:48:05 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-16 17:48:09 +0200 |
| commit | e0151abdb5372176e4139307390d71de18a39dca (patch) | |
| tree | c5cfc30d5146fbad947b8fbf9ca4ef692fcdc3e2 | |
| parent | 7e7647c1594fc009a071b6b24bbf2eff5c5b2dfd (diff) | |
| download | forums-e0151abdb5372176e4139307390d71de18a39dca.tar forums-e0151abdb5372176e4139307390d71de18a39dca.tar.gz forums-e0151abdb5372176e4139307390d71de18a39dca.tar.bz2 forums-e0151abdb5372176e4139307390d71de18a39dca.tar.xz forums-e0151abdb5372176e4139307390d71de18a39dca.zip | |
[ticket/8558] Do string concatenation only once and do htmlspecialchars
PHPBB3-8558
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 333914f02f..a303bdac57 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -486,14 +486,16 @@ class messenger $use_queue = true; } + $board_contact = '"' . mail_encode(htmlspecialchars($config['sitename'])) . '" <' . $config['board_contact'] . '>'; + if (empty($this->replyto)) { - $this->replyto = '"' . $config['sitename'] . '" <' . $config['board_contact'] . '>'; + $this->replyto = $board_contact; } if (empty($this->from)) { - $this->from = '"' . $config['sitename'] . '" <' . $config['board_contact'] . '>'; + $this->from = $board_contact; } $encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol; |