From 94065fde33f500691cd7fc118cfeef4ea4ca22da Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 2 Nov 2016 19:26:02 -0700 Subject: issue #576 - duplicate events shown --- Zotlabs/Module/Cal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Cal.php') diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 0d1641efe..d03e2e951 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -224,7 +224,7 @@ class Cal extends \Zotlabs\Web\Controller { $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on event_hash = resource_id - where resource_type = 'event' and event.uid = %d $ignored + 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' )) $sql_extra ", intval($channel['channel_id']), -- cgit v1.2.3