aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-05-15 18:21:52 +0200
committerMario Vavti <mario@mariovavti.com>2019-05-15 18:21:52 +0200
commit8be00316025efc424a7b38ab5a2542dd5d1e9fd0 (patch)
tree8c1f6ca89a50a5735ddf8d594adb9bace9269dd6 /Zotlabs
parent3c8867a1e861f75cb7a11e2ea6a15b2d2e457b7b (diff)
downloadvolse-hubzilla-8be00316025efc424a7b38ab5a2542dd5d1e9fd0.tar.gz
volse-hubzilla-8be00316025efc424a7b38ab5a2542dd5d1e9fd0.tar.bz2
volse-hubzilla-8be00316025efc424a7b38ab5a2542dd5d1e9fd0.zip
calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Channel_calendar.php5
1 files changed, 3 insertions, 2 deletions
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 {