aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-02 13:03:14 +0200
committerNils Adermann <naderman@naderman.de>2014-05-02 13:03:14 +0200
commit76574d4b5e6c2f6de0faf175c745bcdc74c60f4e (patch)
treeec0432078c4c29ba4e3cd4c6543bc73d8a3f624a
parent854854b60f2b452df57482667cd211bddd123663 (diff)
downloadforums-76574d4b5e6c2f6de0faf175c745bcdc74c60f4e.tar
forums-76574d4b5e6c2f6de0faf175c745bcdc74c60f4e.tar.gz
forums-76574d4b5e6c2f6de0faf175c745bcdc74c60f4e.tar.bz2
forums-76574d4b5e6c2f6de0faf175c745bcdc74c60f4e.tar.xz
forums-76574d4b5e6c2f6de0faf175c745bcdc74c60f4e.zip
[ticket/8558] htmlspecialchars_decode the contact name for emails
PHPBB3-8558
-rw-r--r--phpBB/includes/functions_messenger.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 26ec2d7a5f..79a5aeda1a 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -484,7 +484,8 @@ class messenger
$use_queue = true;
}
- $board_contact = (($config['board_contact_name'] !== '') ? '"' . mail_encode($config['board_contact_name']) . '" ' : '') . '<' . $config['board_contact'] . '>';
+ $contact_name = htmlspecialchars_decode($config['board_contact_name']);
+ $board_contact = (($contact_name !== '') ? '"' . mail_encode($contact_name) . '" ' : '') . '<' . $config['board_contact'] . '>';
if (empty($this->replyto))
{