diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
| commit | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (patch) | |
| tree | 07a1b31339ccd871bb4fbfe73e3f0d4911689795 /include/enotify.php | |
| parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
| parent | 53157bb954acb7597347c6b4a87e64e7a2f6cc79 (diff) | |
| download | volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.gz volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.bz2 volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.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)."-" |