diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index e2d4dbe9e0..aa97ff4df0 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1636,7 +1636,7 @@ class calendar_boupdate extends calendar_bo } else { - $matchFields = array('priority', 'public', 'non_blocking'); + $matchFields = array('priority', 'public'); } $matchFields[] = 'recurrence'; foreach ($matchFields as $key) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index cf3cc762a1..8a6aa70481 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -2839,7 +2839,6 @@ class calendar_ical extends calendar_boupdate elseif (strtolower($agendaEntryType) == 'event') { $event['special'] = '2'; - $event['non_blocking'] = 1; } }