regard timezones in calendar import/export

2019-06-03 13:25:48 +02:00
parent 89205276ab
commit 5b4aa1afc2
2 changed files with 26 additions and 5 deletions
--- 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)
 				);