diff options
| author | Mario <mario@mariovavti.com> | 2019-06-20 17:32:10 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-20 17:32:10 +0200 |
| commit | 5b727065cf650a982bca0252b36a70acb80d904d (patch) | |
| tree | 7eb3c6d68a596d334b55149a748032cac370564d /Zotlabs/Module/Channel_calendar.php | |
| parent | 8c92b0cd3aaefde7a960fa1811021da247a4e28f (diff) | |
| parent | 952e466d9121726f00c94b6527ff01255529b82c (diff) | |
| download | volse-hubzilla-5b727065cf650a982bca0252b36a70acb80d904d.tar.gz volse-hubzilla-5b727065cf650a982bca0252b36a70acb80d904d.tar.bz2 volse-hubzilla-5b727065cf650a982bca0252b36a70acb80d904d.zip | |
Merge branch 'dev' into 'dev'
changes to support direct messages in zot6 (set item.item_private = 2 when...
See merge request hubzilla/core!1679
Diffstat (limited to 'Zotlabs/Module/Channel_calendar.php')
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index ac08dfa96..bb0c9f857 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -381,7 +381,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller { 'end' => $end, 'drop' => $drop, 'allDay' => (($rr['adjust']) ? 0 : 1), - 'title' => htmlentities($rr['summary'], ENT_COMPAT, 'UTF-8', false), + 'title' => html_entity_decode($rr['summary'],ENT_COMPAT,'UTF-8'), 'editable' => $edit ? true : false, 'item' => $rr, 'plink' => [$rr['plink'], t('Link to source')], @@ -402,7 +402,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller { echo ical_wrapper($r); killme(); } - + if (\App::$argv[1] === 'json'){ json_return_and_die($events); } |