From 76574d4b5e6c2f6de0faf175c745bcdc74c60f4e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Fri, 2 May 2014 13:03:14 +0200
Subject: [PATCH] [ticket/8558] htmlspecialchars_decode the contact name for
 emails

PHPBB3-8558
---
 phpBB/includes/functions_messenger.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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))
 		{