From 0a59903259346e17e06fd7449fb213bb522077a0 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 4 Nov 2010 08:40:52 +1300 Subject: [PATCH] Support event properties in changed part of sync-response. --- inc/caldav-REPORT-sync-collection.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/caldav-REPORT-sync-collection.php b/inc/caldav-REPORT-sync-collection.php index 18e1ed3b..2bdb8e41 100644 --- a/inc/caldav-REPORT-sync-collection.php +++ b/inc/caldav-REPORT-sync-collection.php @@ -102,6 +102,8 @@ if ( $qry->Exec("REPORT",__LINE__,__FILE__) ) { new XMLElement( 'href', ConstructURL($object->dav_name) ), new XMLElement( 'status', display_status($object->sync_status) ) ); + $dav_resource = new DAVResource($object); + $resultset = array_merge( $resultset, $dav_resource->GetPropStat($proplist,$reply) ); $responses[] = new XMLElement( 'sync-response', $resultset ); } /** Else: @@ -118,10 +120,8 @@ if ( $qry->Exec("REPORT",__LINE__,__FILE__) ) { new XMLElement( 'href', ConstructURL($object->dav_name) ), new XMLElement( 'status', display_status($object->sync_status) ) ); - if ( $object->sync_status != 404 ) { - $dav_resource = new DAVResource($object); - $resultset = array_merge( $resultset, $dav_resource->GetPropStat($proplist,$reply) ); - } + $dav_resource = new DAVResource($object); + $resultset = array_merge( $resultset, $dav_resource->GetPropStat($proplist,$reply) ); $response_tag = 'response'; if ( isset($c->use_old_sync_response_tag) && $c->use_old_sync_response_tag ) $response_tag = 'sync-response'; $responses[] = new XMLElement( $response_tag, $resultset );