File iRony-0.2.4-2473-expect-list-of-spouses.patch of Package iRony

File iRony-0.2.4-2473-expect-list-of-spouses.patch of Package iRony (Revision 27)

Currently displaying revision 27 , Show latest

commit bdee746a01716cbe564ba77c5c9c7f70ee840c26
Author: Thomas <tb@woodcrest.local>
Date:   Mon Nov 4 10:14:01 2013 +0100

Expect Spouse values to be a list from libkolab (#2473)

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;