From 66c6c6c7d1c87aa50ac0fe701505802110b8eecb Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 3 Jun 2019 11:25:48 +0000 Subject: regard timezones in calendar import/export (cherry picked from commit 5b4aa1afc2d3811aae93706299dfb5d5c703198f) --- Zotlabs/Module/Channel_calendar.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index 13f879d84..4f08eb27c 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -304,7 +304,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller { ); } elseif($export) { - $r = q("SELECT * from event where uid = %d and dtstart > '%s' and dtend > dtstart", + $r = q("SELECT event.*, item.id as item_id + from event left join item on item.resource_id = event.event_hash + where event.uid = %d and event.dtstart > '%s' and event.dtend > event.dtstart", intval(local_channel()), dbesc(NULL_DATE) ); -- cgit v1.2.3