From dc8b3f2dec9b98e35d9d3fb60c442f1467294f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Fri, 14 May 2010 09:28:46 +0000 Subject: [PATCH] Fix 'non_blocking' issue (especially for Nokia) --- calendar/inc/class.calendar_boupdate.inc.php | 2 +- calendar/inc/class.calendar_ical.inc.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index 5b87a380e9..956372d142 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1707,7 +1707,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 29128ae74a..5f60c7006d 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -2843,7 +2843,6 @@ class calendar_ical extends calendar_boupdate elseif (strtolower($agendaEntryType) == 'event') { $event['special'] = '2'; - $event['non_blocking'] = 1; } }