From fba3bda918108e004033ae8b805191a9838ff5a5 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 2 Oct 2012 12:56:17 +0000 Subject: [PATCH] * Calendar/CalDAV/eSync: fixed recuring events were returned in sync, even if user rejected (after recent database schema changes) --- calendar/inc/class.calendar_so.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index fe6d50323f..dcb4c2bfe5 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -544,8 +544,8 @@ class calendar_so " ON $this->cal_table.cal_id=rejected_by_user.cal_id". " AND rejected_by_user.cal_user_type='u'". " AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user). - " AND (recur_type IS NULL AND rejected_by_user.cal_recur_date=0". - ($params['enum_recuring'] ? " OR cal_start=rejected_by_user.cal_recur_date" : '').')'; + " AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' : + '(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)'); $or_required = array( 'rejected_by_user.cal_status IS NULL', "rejected_by_user.cal_status NOT IN ('R','X')",