diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-05-15 16:21:52 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-05-15 18:25:59 +0200 |
| commit | 22162635e75644ccd244ad646ed0484c5710e7a9 (patch) | |
| tree | 8b4fe65c33422b984298e1a42859d8ad325cd831 | |
| parent | 29c5e74d3103a200470d799d6542a85a7a46c7d0 (diff) | |
| download | volse-hubzilla-22162635e75644ccd244ad646ed0484c5710e7a9.tar.gz volse-hubzilla-22162635e75644ccd244ad646ed0484c5710e7a9.tar.bz2 volse-hubzilla-22162635e75644ccd244ad646ed0484c5710e7a9.zip | |
calendar merge: only export events that will not break the importer. this will probably dismiss some old experimental entries
(cherry picked from commit 8be00316025efc424a7b38ab5a2542dd5d1e9fd0)
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 5 |
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 { |