diff options
| author | Mario <mario@mariovavti.com> | 2019-06-03 11:25:48 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-06-03 13:27:16 +0200 |
| commit | 66c6c6c7d1c87aa50ac0fe701505802110b8eecb (patch) | |
| tree | eabc52344259474066818a55fdcefa8a880e845f /Zotlabs | |
| parent | 6d2ab6a7d68ac8bb474344eeb1a3baa4cb7c3b99 (diff) | |
| download | volse-hubzilla-66c6c6c7d1c87aa50ac0fe701505802110b8eecb.tar.gz volse-hubzilla-66c6c6c7d1c87aa50ac0fe701505802110b8eecb.tar.bz2 volse-hubzilla-66c6c6c7d1c87aa50ac0fe701505802110b8eecb.zip | |
regard timezones in calendar import/export
(cherry picked from commit 5b4aa1afc2d3811aae93706299dfb5d5c703198f)
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Channel_calendar.php | 4 |
1 files changed, 3 insertions, 1 deletions
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) ); |