aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-06-19 21:41:46 -0700
committerzotlabs <mike@macgirvin.com>2019-06-19 21:41:46 -0700
commitc1cc76119cf055c50045af24df07040fa32d2bf6 (patch)
treebdde9ace13a7dca347ee2deb7732f8b276cc8c8e
parent9d156141b1205e48bbb3008f2a3040caa4c33192 (diff)
downloadvolse-hubzilla-c1cc76119cf055c50045af24df07040fa32d2bf6.tar.gz
volse-hubzilla-c1cc76119cf055c50045af24df07040fa32d2bf6.tar.bz2
volse-hubzilla-c1cc76119cf055c50045af24df07040fa32d2bf6.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
-rw-r--r--Zotlabs/Module/Channel_calendar.php4
-rw-r--r--Zotlabs/Module/Events.php3
2 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 4f08eb27c..9a735ffc5 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 e883db49f..056d0cd5a 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -662,9 +662,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"' );