diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:42:32 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-02 12:42:32 +0200 |
| commit | e511ea71c17b34fb6bb5233831c6b0b88b1f98b8 (patch) | |
| tree | e42de1f147088f304d8ff893959a57a22e7168ad | |
| parent | 0c02607aa8be4b1d6626411b577fa78ed9b4a195 (diff) | |
| parent | e0151abdb5372176e4139307390d71de18a39dca (diff) | |
| download | forums-e511ea71c17b34fb6bb5233831c6b0b88b1f98b8.tar forums-e511ea71c17b34fb6bb5233831c6b0b88b1f98b8.tar.gz forums-e511ea71c17b34fb6bb5233831c6b0b88b1f98b8.tar.bz2 forums-e511ea71c17b34fb6bb5233831c6b0b88b1f98b8.tar.xz forums-e511ea71c17b34fb6bb5233831c6b0b88b1f98b8.zip | |
Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558:
[ticket/8558] Do string concatenation only once and do htmlspecialchars
[ticket/8558] Add display name in emails from board
| -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 907252f6d8..12a3c7b6a4 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -484,14 +484,16 @@ class messenger $use_queue = true; } + $board_contact = '"' . mail_encode(htmlspecialchars($config['sitename'])) . '" <' . $config['board_contact'] . '>'; + if (empty($this->replyto)) { - $this->replyto = '<' . $config['board_contact'] . '>'; + $this->replyto = $board_contact; } if (empty($this->from)) { - $this->from = '<' . $config['board_contact'] . '>'; + $this->from = $board_contact; } $encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol; |