aboutsummaryrefslogtreecommitdiffstats
path: root/include/enotify.php
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-19 16:55:33 +0200
committerMichael <icarus@dabo.de>2012-05-19 16:55:33 +0200
commit6342b3e0bdd5774857a8fca809994f05e0208d25 (patch)
tree54114a005e74c8a6d8bad8a490e1d1e41bc4178f /include/enotify.php
parent2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (diff)
parent9a940786c18c1c2bd772aec93f1828f67dc45667 (diff)
downloadvolse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.gz
volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.tar.bz2
volse-hubzilla-6342b3e0bdd5774857a8fca809994f05e0208d25.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'include/enotify.php')
-rw-r--r--include/enotify.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/enotify.php b/include/enotify.php
index 8385bdec5..ca134ac86 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -402,8 +402,8 @@ class enotify {
*/
static public function send($params) {
- $fromName = email_header_encode($params['fromName'],'UTF-8');
- $messageSubject = email_header_encode($params['messageSubject'],'UTF-8');
+ $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');
+ $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
// generate a mime boundary
$mimeBoundary =rand(0,9)."-"