diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-27 15:28:52 -0800 |
| commit | db9ea66069f2a2df6044e8267a68eae377c45911 (patch) | |
| tree | aa93597df2ee43ceeaa980db864b58143f2e06df /Zotlabs/Module/Cal.php | |
| parent | ef02464e3c3188563349bfda42585ce40cdb45ad (diff) | |
| parent | c2830c4a98cf3c9983b3c4b61024d52a6d7187df (diff) | |
| download | volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.gz volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.bz2 volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'Zotlabs/Module/Cal.php')
| -rw-r--r-- | Zotlabs/Module/Cal.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index b2e1c9235..1279a51b1 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -109,7 +109,7 @@ class Cal extends \Zotlabs\Web\Controller { /* edit/create form */ if($event_id) { - $r = q("SELECT * FROM `event` WHERE event_hash = '%s' AND `uid` = %d LIMIT 1", + $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", dbesc($event_id), intval($channel['channel_id']) ); @@ -228,7 +228,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']), |