* CalDAV/CardDAV: fixed not working propfind-request to single resource in calendar/addressbook collection

This commit is contained in:
Ralf Becker 2013-10-01 11:38:34 +00:00
parent 9288d23117
commit 18285429e9
3 changed files with 6 additions and 2 deletions

View File

@ -208,6 +208,10 @@ class addressbook_groupdav extends groupdav_handler
// detect sync-collection report // detect sync-collection report
$sync_collection_report = isset($filter[0]) && strpos($filter[0], 'contact_modified>') === 0; $sync_collection_report = isset($filter[0]) && strpos($filter[0], 'contact_modified>') === 0;
if (isset($filter_in[self::$path_attr]) && !is_array($filter_in[self::$path_attr]))
{
$filter_in[self::$path_attr] = (array)$filter_in[self::$path_attr];
}
$requested_multiget_ids =& $filter_in[self::$path_attr]; $requested_multiget_ids =& $filter_in[self::$path_attr];
$files = array(); $files = array();

View File

@ -263,7 +263,7 @@ class calendar_groupdav extends groupdav_handler
$filter['offset'] = $start[0]; $filter['offset'] = $start[0];
$filter['num_rows'] = $start[1]; $filter['num_rows'] = $start[1];
} }
$requested_multiget_ids = $filter['query'][self::$path_attr]; $requested_multiget_ids = (array)$filter['query'][self::$path_attr];
$sync_collection = strpos($filter['query'][0],'cal_modified>') === 0 && $filter['filter'] == 'everything'; $sync_collection = strpos($filter['query'][0],'cal_modified>') === 0 && $filter['filter'] == 'everything';
$events =& $this->bo->search($filter); $events =& $this->bo->search($filter);

View File

@ -254,7 +254,7 @@ class infolog_groupdav extends groupdav_handler
$offset = 0; $offset = 0;
} }
$requested_multiget_ids = $filter[self::$path_attr]; $requested_multiget_ids = (array)$filter[self::$path_attr];
$files = array(); $files = array();
// ToDo: add parameter to only return id & etag // ToDo: add parameter to only return id & etag