diff options
| author | zotlabs <mike@macgirvin.com> | 2018-09-20 22:46:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-09-20 22:46:47 -0700 |
| commit | ba49e6a5889ffbb91ce783a00334d2b6221c42b7 (patch) | |
| tree | 9775465daf2f124547b32f57004bd4e8ab8d8c78 | |
| parent | 5525f082e64bb942f8aae97d4976ea1ec0aa91ec (diff) | |
| download | volse-hubzilla-ba49e6a5889ffbb91ce783a00334d2b6221c42b7.tar.gz volse-hubzilla-ba49e6a5889ffbb91ce783a00334d2b6221c42b7.tar.bz2 volse-hubzilla-ba49e6a5889ffbb91ce783a00334d2b6221c42b7.zip | |
don't double encode
| -rw-r--r-- | Zotlabs/Module/Cal.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Events.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 3809064b0..14c109515 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -294,7 +294,7 @@ class Cal extends \Zotlabs\Web\Controller { } $html = format_event_html($rr); $rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); - $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8'); + $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false); $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 2115edde5..213fa6bff 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -641,7 +641,7 @@ class Events extends \Zotlabs\Web\Controller { } $html = format_event_html($rr); $rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); - $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8'); + $rr['description'] = htmlentities(html2plain(bbcode($rr['description'])),ENT_COMPAT,'UTF-8',false); $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], |