aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-30 14:49:56 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-30 14:49:56 +0000
commitd71d367fa5747bdedcd617e856343cd1fee2465a (patch)
tree1ee25d826927780a23c9407efdfcf4159c0111f4
parent9850a2abe89b796a9d6f4ecf59af005d21bc8352 (diff)
downloadelgg-d71d367fa5747bdedcd617e856343cd1fee2465a.tar.gz
elgg-d71d367fa5747bdedcd617e856343cd1fee2465a.tar.bz2
Closes #889: Decoding html entities from messages before stripping tags
git-svn-id: https://code.elgg.org/elgg/trunk@3180 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/notification.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index abd3fbb55..44d896d18 100644
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -273,7 +273,8 @@
$subject = mb_encode_mimeheader($subject,"UTF-8", "B");
}
- // Format message
+ // Format message
+ $message = html_entity_decode($message, ENT_COMPAT, 'UTF-8'); // Decode any html entities
$message = strip_tags($message); // Strip tags from message
$message = preg_replace("/(\r\n|\r)/", "\n", $message); // Convert to unix line endings in body
$message = preg_replace("/^From/", ">From", $message); // Change lines starting with From to >From