harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't double encode

Browse Source
This commit is contained in:
zotlabs 2018-09-20 22:46:47 -07:00
parent 5525f082e6
commit ba49e6a588
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Cal.php
View File

@ -294,7 +294,7 @@ class Cal extends \Zotlabs\Web\Controller {
} }
$html = format_event_html($rr); $html = format_event_html($rr);
$rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); $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']))); $rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
$events[] = array( $events[] = array(
'id'=>$rr['id'], 'id'=>$rr['id'],

2
Zotlabs/Module/Events.php
View File

@ -641,7 +641,7 @@ class Events extends \Zotlabs\Web\Controller {
} }
$html = format_event_html($rr); $html = format_event_html($rr);
$rr['desc'] = zidify_links(smilies(bbcode($rr['desc']))); $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']))); $rr['location'] = zidify_links(smilies(bbcode($rr['location'])));
$events[] = array( $events[] = array(
'id'=>$rr['id'], 'id'=>$rr['id'],