From 4755f00f06b667f6eafb24c156716892897e307b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 20 Jan 2015 14:57:40 +0000 Subject: [PATCH] for group-invitations we need to check memberships of $user too --- calendar/inc/class.calendar_groupdav.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index 2b1c14d3a1..fdf3616de0 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -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); }