From 01a6873d4a73c864e805304880698cba634739f8 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Fri, 25 Oct 2013 23:45:26 +1300 Subject: [PATCH] Revert "add fix for the OSX Contacts.app:" This reverts commit 3ab7787f7b2c6bebccbacb31396f77f09aa93f09. The correct fix for the underlying issue which this attempted to work around was applied in the AWL/XMLElement Render method. ["correct fix" likely refers to awl commits 4b56e64bc7127a12df737f157e36fd2de19391dd, 2589e71e18e6ced753500afe0197995290fac52c, aafbd7b1e6ffb59166d57725102f2f5a817a8590 and 46b112f85711732b62e70f2fb40b866423bbf3b5 picked from github handle-remote-attendees branch] --- inc/caldav-REPORT.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/caldav-REPORT.php b/inc/caldav-REPORT.php index ccf356ca..19cebc3a 100644 --- a/inc/caldav-REPORT.php +++ b/inc/caldav-REPORT.php @@ -152,11 +152,11 @@ function component_to_xml( $properties, $item ) { $prop->NewElement($base_tag, ISODateToHTTPDate($item->modified) ); break; case 'urn:ietf:params:xml:ns:caldav:calendar-data': - if ( $type == 'calendar' ) $reply->CalDAVElement($prop, $base_tag, '' ); + if ( $type == 'calendar' ) $reply->CalDAVElement($prop, $base_tag, $caldav_data ); else $unsupported[] = $base_tag; break; case 'urn:ietf:params:xml:ns:carddav:address-data': - if ( $type == 'vcard' ) $reply->CardDAVElement($prop, $base_tag, '' ); + if ( $type == 'vcard' ) $reply->CardDAVElement($prop, $base_tag, $caldav_data ); else $unsupported[] = $base_tag; break; case 'DAV::getcontenttype':