Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_format_contact.php |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d1a56f70e5265421cf182500e9d070af039c281c
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue May 6 17:47:44 2014 +0200

    Convert array values from vcard import into string (OTRS #1000356)

diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
index c8002b8..45b7a6d 100644
--- a/plugins/libkolab/lib/kolab_format_contact.php
+++ b/plugins/libkolab/lib/kolab_format_contact.php
@@ -174,6 +174,11 @@ class kolab_format_contact extends kolab_format
             $this->kolab_object[$col] = join('; ', $values);
         }
 
+        // notes/body can be an array from vcard import (OTRS #1000356)
+        if (is_array($this->kolab_object['body'])) {
+            $this->kolab_object['body'] = join("\n", $this->kolab_object['body']);
+        }
+
         // save email addresses as simple-person attributes
         $emails = array();
         foreach ((array)$object['email'] as $email) {