From: cash <cash.costello@gmail.com>
Date: Mon, 18 Feb 2013 14:50:34 +0000 (-0500)
Subject: Closes #5053 decodes html entities for email subjects
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=46b07a30cecbbf5a3c6cee66d7573170272f6f03;p=lorea%2Felgg.git

Closes #5053 decodes html entities for email subjects
---

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 56e591192..b6399b3c6 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -347,6 +347,8 @@ function elgg_send_email($from, $to, $subject, $body, array $params = NULL) {
 
 	// Sanitise subject by stripping line endings
 	$subject = preg_replace("/(\r\n|\r|\n)/", " ", $subject);
+	// this is because Elgg encodes everything and matches what is done with body
+	$subject = html_entity_decode($subject, ENT_COMPAT, 'UTF-8'); // Decode any html entities
 	if (is_callable('mb_encode_mimeheader')) {
 		$subject = mb_encode_mimeheader($subject, "UTF-8", "B");
 	}