summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <tb@woodcrest.local>2013-11-04 09:14:01 (GMT)
committerThomas <tb@woodcrest.local>2013-11-04 09:14:23 (GMT)
commitbdee746a01716cbe564ba77c5c9c7f70ee840c26 (patch)
treeb4d1a60e38c5fe2de69eb42c6a95f098bafb45ef
parent3c8d6c87f57b05b47ce89bf6cae78a898f725775 (diff)
downloadiRony-bdee746a01716cbe564ba77c5c9c7f70ee840c26.tar.gz
Expect Spouse values to be a list from libkolab (#2473)
-rw-r--r--lib/Kolab/CardDAV/ContactsBackend.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kolab/CardDAV/ContactsBackend.php b/lib/Kolab/CardDAV/ContactsBackend.php
index eec0bf3..442277c 100644
--- a/lib/Kolab/CardDAV/ContactsBackend.php
+++ b/lib/Kolab/CardDAV/ContactsBackend.php
@@ -663,7 +663,7 @@ class ContactsBackend extends CardDAV\Backend\AbstractBackend
if (!empty($contact['manager']))
$vc->add('X-MANAGER', join(',', (array)$contact['manager']));
if (!empty($contact['spouse']))
- $vc->add('X-SPOUSE', $contact['spouse']);
+ $vc->add('X-SPOUSE', join(',', (array)$contact['spouse']));
if (!empty($contact['children']))
$vc->add('X-CHILDREN', join(',', (array)$contact['children']));
@@ -858,13 +858,13 @@ class ContactsBackend extends CardDAV\Backend\AbstractBackend
break;
case 'X-PROFESSION':
- case 'X-SPOUSE':
$contact[strtolower(substr($prop->name, 2))] = $prop->value;
break;
case 'X-MANAGER':
case 'X-ASSISTANT':
case 'X-CHILDREN':
+ case 'X-SPOUSE':
$contact[strtolower(substr($prop->name, 2))] = explode(',', $prop->value);
break;