diff options
| author | zottel <github@zottel.net> | 2012-05-02 08:11:52 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-02 08:11:52 +0200 |
| commit | 6000e7f30d1193dada903eaf0e6f44149a3dde33 (patch) | |
| tree | 9b9f482f611b6dd91866518387b79140c6567be7 /include/enotify.php | |
| parent | 2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177 (diff) | |
| parent | becdb1f5085f2561b8b0acebbdbf43e4a81d50da (diff) | |
| download | volse-hubzilla-6000e7f30d1193dada903eaf0e6f44149a3dde33.tar.gz volse-hubzilla-6000e7f30d1193dada903eaf0e6f44149a3dde33.tar.bz2 volse-hubzilla-6000e7f30d1193dada903eaf0e6f44149a3dde33.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/enotify.php')
| -rw-r--r-- | include/enotify.php | 4 |
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)."-" |