diff options
| author | zotlabs <mike@macgirvin.com> | 2019-06-20 04:41:46 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-20 18:39:58 +0200 |
| commit | 8aefbd911bf549fbe8ce61a51db3b2bae5d503af (patch) | |
| tree | e0ddd613569030bbb5a5358e7da1fc20871e1462 | |
| parent | f046a34d34b4799b45bfae859969be4d20565545 (diff) | |
| download | volse-hubzilla-8aefbd911bf549fbe8ce61a51db3b2bae5d503af.tar.gz volse-hubzilla-8aefbd911bf549fbe8ce61a51db3b2bae5d503af.tar.bz2 volse-hubzilla-8aefbd911bf549fbe8ce61a51db3b2bae5d503af.zip | |
events: don't use htmlentities on local (hz) event titles as they are not being used in textareas and umlauts for instance are getting mangled on the calendar display
(cherry picked from commit c1cc76119cf055c50045af24df07040fa32d2bf6)
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Events.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index ac08dfa96..eb2ed230d 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' => $rr['summary'], '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); } diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index dcdbfd233..681d6887d 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -668,9 +668,10 @@ class Events extends \Zotlabs\Web\Controller { 'html'=>$html, 'plink' => array($rr['plink'],t('Link to Source'),'',''), ); + } } - + if($export) { header('Content-type: text/calendar'); header('content-disposition: attachment; filename="' . t('calendar') . '-' . $channel['channel_address'] . '.ics"' ); |