DAV: Don't consider addressbooks to be calendars (T7276)
This commit is contained in:
parent
84ef4ac9e3
commit
b7dc093954
1 changed files with 7 additions and 4 deletions
|
@ -256,10 +256,13 @@ class kolab_dav_client
|
|||
foreach ($response->getElementsByTagName('response') as $element) {
|
||||
$folder = $this->getFolderPropertiesFromResponse($element);
|
||||
|
||||
// Note: Addressbooks don't have 'types' specified
|
||||
if (($component == 'VCARD' && in_array('addressbook', $folder['resource_type']))
|
||||
|| in_array($component, (array) $folder['types'])
|
||||
) {
|
||||
// Filter out the folders of other type
|
||||
if ($component == 'VCARD') {
|
||||
if (in_array('addressbook', $folder['resource_type'])) {
|
||||
$folders[] = $folder;
|
||||
}
|
||||
}
|
||||
else if (in_array('calendar', $folder['resource_type']) && in_array($component, (array) $folder['types'])) {
|
||||
$folders[] = $folder;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue