diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-02 19:26:02 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-02 19:26:02 -0700 |
| commit | 94065fde33f500691cd7fc118cfeef4ea4ca22da (patch) | |
| tree | 548c799e6e741f345cc8b18652ecf8adc13964c5 /Zotlabs | |
| parent | aab7bc5282bffeb553c1bbd505ac74fde233ea3b (diff) | |
| download | volse-hubzilla-94065fde33f500691cd7fc118cfeef4ea4ca22da.tar.gz volse-hubzilla-94065fde33f500691cd7fc118cfeef4ea4ca22da.tar.bz2 volse-hubzilla-94065fde33f500691cd7fc118cfeef4ea4ca22da.zip | |
issue #576 - duplicate events shown
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Cal.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Events.php | 5 |
2 files changed, 3 insertions, 4 deletions
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']), diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index c1c475636..b8910b644 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -559,10 +559,10 @@ class Events extends \Zotlabs\Web\Controller { // There's still an issue if the finish date crosses the end of month. // Noting this for now - it will need to be fixed here and in Friendica. // 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 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' )) ", intval(local_channel()), @@ -571,7 +571,6 @@ class Events extends \Zotlabs\Web\Controller { dbesc($adjust_start), dbesc($adjust_finish) ); - } $links = array(); |