diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-09-21 12:45:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-09-21 12:45:32 +0200 |
| commit | 46d6d1c329e52e7e705374f56d1a8da6277aa454 (patch) | |
| tree | 846eeb249bf2393eed334d328b40d38e8154cda3 /Zotlabs/Module/Events.php | |
| parent | 4dd1521677851cb88a497cb5710fb272d9d4fc9d (diff) | |
| parent | ba49e6a5889ffbb91ce783a00334d2b6221c42b7 (diff) | |
| download | volse-hubzilla-46d6d1c329e52e7e705374f56d1a8da6277aa454.tar.gz volse-hubzilla-46d6d1c329e52e7e705374f56d1a8da6277aa454.tar.bz2 volse-hubzilla-46d6d1c329e52e7e705374f56d1a8da6277aa454.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Events.php')
| -rw-r--r-- | Zotlabs/Module/Events.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 33c8b8249..213fa6bff 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -6,7 +6,7 @@ require_once('include/bbcode.php'); require_once('include/datetime.php'); require_once('include/event.php'); require_once('include/items.php'); - +require_once('include/html2plain.php'); class Events extends \Zotlabs\Web\Controller { @@ -641,6 +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',false); $rr['location'] = zidify_links(smilies(bbcode($rr['location']))); $events[] = array( 'id'=>$rr['id'], @@ -659,8 +660,6 @@ class Events extends \Zotlabs\Web\Controller { 'html'=>$html, 'plink' => array($rr['plink'],t('Link to Source'),'',''), ); - - } } |