diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-11-14 20:47:38 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-11-14 20:47:38 -0500 |
| commit | 1985502894651b263cca769509220b9e85827b4a (patch) | |
| tree | 5d4dc894b276629e64e0fbce95f088bd3c0692a2 /Zotlabs/Module | |
| parent | c3e3c32bdcdbcafef33f32118fe95da1fa4cd92e (diff) | |
| parent | 9eab9512a334a08ebe69a29e4b400ea34a87a516 (diff) | |
| download | volse-hubzilla-1985502894651b263cca769509220b9e85827b4a.tar.gz volse-hubzilla-1985502894651b263cca769509220b9e85827b4a.tar.bz2 volse-hubzilla-1985502894651b263cca769509220b9e85827b4a.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Cal.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index d03e2e951..1279a51b1 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -209,6 +209,10 @@ class Cal extends \Zotlabs\Web\Controller { $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); + + if(! perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'view_contacts')) + $sql_extra .= " and etype != 'birthday' "; + if (x($_GET,'id')){ $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d $sql_extra limit 1", |