Author: ralfbecker
Date: Wed Apr 27 18:27:32 2016
New Revision: 55897
URL: http://svn.stylite.de/viewvc/egroupware?rev=55897&view=rev
Log:
* CalDAV: fix exceptions (EXDATE) was exported with timezone and Zulu-time, causing eM Clinet to fail
current Horde_Icalendar only exports EXDATE in Zulu-time, so we can only remove timezone. Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
Modified:
branches/14.2/calendar/ (props changed)
branches/14.2/calendar/inc/class.calendar_ical.inc.php
Propchange: branches/14.2/calendar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 18:27:32 2016
@@ -1,2 +1,2 @@
/branches/Stylite-EPL-11.1/calendar:51445
-/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051,55344,55526,55859
+/trunk/calendar:51362,51371,51376,51394,51400,51456,51474,51540,51547,51569,51573,51592,51596,51614,51812,51817,51844,51846,51848,51850,51901,51936,51953,52018,52020,52060,52085,52114,52116,52118-52119,52216,52249,52252,52284,52338,52347,52362,52408,52413,52416,52434,52463,52469,52506,52509,52536,52593,52658,52672,52695,52834,52931,52933,52971-52973,52983-52988,53008,53084,53087,53116,53118,53120,53146-53147,53155,53176,53178,53194,53258,53421,53496,53500,53534,53536,53577,53620,53668,53703,53724-53725,53742,53752,53755,53757,53759,53781-53782,53833,53836,53870,53892,53894,53900,53910,53950,53989,54152,54154,54201,54225,54263,54273,54275,54287,54335,54367,54376,54557-54558,54691,54741,54754,54887,55051,55344,55526,55859,55896
Modified: branches/14.2/calendar/inc/class.calendar_ical.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/calendar/inc/class.calendar_ical.inc.php?rev=55897&r1=55896&r2=55897&view=diff
==============================================================================
--- branches/14.2/calendar/inc/class.calendar_ical.inc.php (original)
+++ branches/14.2/calendar/inc/class.calendar_ical.inc.php Wed Apr 27 18:27:32 2016
@@ -657,13 +657,9 @@
{
foreach ($event['recur_exception'] as $key => $timestamp)
{
- $event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid,$parameters['EXDATE']);
- }
- if ($version != '1.0')
- {
- // VALUE=DATE-TIME is default and optional
- // adding it causes iCal on iOS 5.1.1 / OSX 10.7.4 to fail to recognice exceptions
- if (!empty($tzid)) $parameters['EXDATE']['TZID'] = $tzid;
+ // current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here
+ // Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
+ $event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']);
}
}
else
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.