From 50543c011515b3f7ae7a781879a00689a01d00ad Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 17 Feb 2011 20:39:10 +0000 Subject: [PATCH] Don't show private events in search results, even if user has freebusy permission --- calendar/inc/class.calendar_bo.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index eff8db461a..7db00bd41d 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -474,13 +474,13 @@ class calendar_bo } if ($is_private || (!$event['public'] && $filter == 'hideprivate')) { - if($params['query'] && !$this->check_perms(EGW_ACL_FREEBUSY,$event)) + if($params['query']) { unset($events[$id]); $this->total--; continue; } - else + elseif($this->check_perms(EGW_ACL_FREEBUSY,$event)) { $this->clear_private_infos($events[$id],$users); }