aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-05-20 12:34:05 +0200
committerMario Vavti <mario@mariovavti.com>2019-05-20 12:34:05 +0200
commite44f0c497f3634b88d8ed4df33a204fc4cbdc1b9 (patch)
treec2d4d6c45d030961700fb3dc264da22f2193d630
parent2d0f96d28be7c701a48e58a63a6296fadccf8cfd (diff)
downloadvolse-hubzilla-e44f0c497f3634b88d8ed4df33a204fc4cbdc1b9.tar.gz
volse-hubzilla-e44f0c497f3634b88d8ed4df33a204fc4cbdc1b9.tar.bz2
volse-hubzilla-e44f0c497f3634b88d8ed4df33a204fc4cbdc1b9.zip
be more precise with table selection
-rw-r--r--Zotlabs/Module/Channel_calendar.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 45f5870d0..87bac2762 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -316,10 +316,10 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
// Ultimately the finish date shouldn't be involved in the query.
$r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan, item.id as item_id
- from event left join item on event_hash = resource_id
- where resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored
- AND (( adjust = 0 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )
- OR ( adjust = 1 AND ( dtend >= '%s' or nofinish = 1 ) AND dtstart <= '%s' )) ",
+ from event left join item on event.event_hash = item.resource_id
+ where item.resource_type = 'event' and event.uid = %d and event.uid = item.uid $ignored
+ AND (( event.adjust = 0 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )
+ OR ( event.adjust = 1 AND ( event.dtend >= '%s' or event.nofinish = 1 ) AND event.dtstart <= '%s' )) ",
intval(local_channel()),
dbesc($start),
dbesc($finish),