nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-02-12 03:14:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of DELETE followed by CREATE case.

Browse Source
This commit is contained in:
Andrew McMillan 2009-12-08 09:24:34 +13:00
parent f3ec8622e9
commit f8331aab2d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/caldav-REPORT-sync-collection.php
View File

@ -72,7 +72,7 @@ if ( $qry->Exec("REPORT",__LINE__,__FILE__) ) {
if ( $object->dav_id == $last_dav_id ) {
/** The complex case: this is the second or subsequent for this dav_id */
if ( $object->sync_status == 404 ) {
if ( $first_action == 201 ) {
if ( $first_status == 201 ) {
array_pop($responses);
$last_dav_id = -1;
$first_status = 0;
@ -87,6 +87,15 @@ if ( $qry->Exec("REPORT",__LINE__,__FILE__) ) {
$first_status = 404;
}
}
else if ( $object->sync_status == 201 && $first_status == 404 ) {
// ... Delete ... Create ... is indicated as a create, but don't forget we started with a delete
array_pop($responses);
$resultset = array(
new XMLElement( 'href', ConstructURL($object->dav_name) ),
new XMLElement( 'status', display_status($object->sync_status) )
);
$responses[] = new XMLElement( 'sync-response', $resultset );
}
/** Else:
* the object existed at start and we have multiple modifications,
* or,