From 8be00316025efc424a7b38ab5a2542dd5d1e9fd0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 15 May 2019 18:21:52 +0200 Subject: calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries --- Zotlabs/Module/Channel_calendar.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php index e513a7f6e..9229e6eb2 100644 --- a/Zotlabs/Module/Channel_calendar.php +++ b/Zotlabs/Module/Channel_calendar.php @@ -335,8 +335,9 @@ class Channel_calendar extends \Zotlabs\Web\Controller { ); } elseif($export) { - $r = q("SELECT * from event where uid = %d", - intval(local_channel()) + $r = q("SELECT * from event where uid = %d and dtstart > '%s' and dtend > dtstart", + intval(local_channel()), + dbesc(NULL_DATE) ); } else { -- cgit v1.2.3