holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

for group-invitations we need to check memberships of $user too

Browse Source
This commit is contained in:
Ralf Becker 2015-01-20 14:57:56 +00:00
parent f5e9f6b55a
commit f5871177c8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -698,7 +698,9 @@ class calendar_groupdav extends groupdav_handler
// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
}
// only add master if we are not expanding and current user participates in master (and not just some exceptions)
if (!$expand && (!$user || isset($master['participants'][$user])))
if (!$expand && (!$user || isset($master['participants'][$user]) ||
// for group-invitations we need to check memberships of $user too
array_intersect(array_keys($master['participants']), $GLOBALS['egw']->accounts->memberships($user, true))))
{
$events = array_merge(array($master), $events);
}