From 0ec4708ba9540365b9c2aaf9c76e2fc3a5899d9b Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 11 Jan 2018 09:33:33 -0700 Subject: [PATCH] * Calendar - Fix bug hiding a user's visible private events when just the group was selected --- calendar/inc/class.calendar_bo.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index 20839ae549..5e24d22f6f 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -591,6 +591,10 @@ class calendar_bo // resolve users to add memberships for users and members for groups // for search, do NOT use freebusy rights, as it would allow to probe the content of event entries $users = $this->resolve_users($params['users'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query'])); + if($params['private_allowed']) + { + $params['private_allowed'] = $this->resolve_users($params['private_allowed'],$params['filter'] == 'no-enum-groups',$params['ignore_acl'], empty($params['query'])); + } // supply so with private_grants, to not query them again from the database if (!empty($params['query']))