aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2013-02-18 09:50:34 -0500
committercash <cash.costello@gmail.com>2013-02-18 09:50:34 -0500
commit46b07a30cecbbf5a3c6cee66d7573170272f6f03 (patch)
tree2ba295b85db2f0d5e214cc4dcf887b2fb0f12fe1 /engine
parentd27d5859a67396f84ec2087136f266a0530bd7c4 (diff)
downloadelgg-46b07a30cecbbf5a3c6cee66d7573170272f6f03.tar.gz
elgg-46b07a30cecbbf5a3c6cee66d7573170272f6f03.tar.bz2
Closes #5053 decodes html entities for email subjects
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/notification.php2
1 files changed, 2 insertions, 0 deletions
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");
}