From da061c11bbd392a3f1234f4b5d6794e52d5b3741 Mon Sep 17 00:00:00 2001 From: "daniel.boelzle%sun.com" Date: Wed, 13 Feb 2008 10:25:42 +0000 Subject: [PATCH] Bug 340949: server cannot cope with floating events, fallback to user default git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@245568 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/calendar/providers/wcap/calWcapCalendarItems.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mozilla/calendar/providers/wcap/calWcapCalendarItems.js b/mozilla/calendar/providers/wcap/calWcapCalendarItems.js index 2e9806e72db..d6df27f726a 100644 --- a/mozilla/calendar/providers/wcap/calWcapCalendarItems.js +++ b/mozilla/calendar/providers/wcap/calWcapCalendarItems.js @@ -69,8 +69,12 @@ calWcapCalendar.prototype.encodeNscpTzid = function calWcapCalendar_encodeNscpTzid(dateTime) { var params = "X-NSCP-ORIGINAL-OPERATION=X-NSCP-WCAP-PROPERTY-"; - if (!dateTime || !dateTime.isValid || dateTime.timezone.isUTC || dateTime.timezone.isFloating) { + if (!dateTime || !dateTime.isValid || dateTime.timezone.isUTC) { params += "DELETE^"; + } else if (dateTime.timezone.isFloating) { + // cs cannot cope with floating, always enforces server tz, + // better use user's tz then: + params += ("REPLACE^" + encodeURIComponent(this.defaultTimezone)); } else { params += ("REPLACE^" + encodeURIComponent(this.getAlignedTzid(dateTime.timezone))); }