Fix handling of 'serialzied' LDAP address attributes

git-svn-id: https://svn.roundcube.net/trunk@6139 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 8 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index d3067e1e1..17fb40784 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -143,7 +143,14 @@ class rcube_ldap extends rcube_addressbook
             }
         }
         else if ($this->coltypes['address']) {
-            $this->coltypes['address'] = array('type' => 'textarea', 'childs' => null, 'limit' => 1, 'size' => 40);
+            $this->coltypes['address'] += array('type' => 'textarea', 'childs' => null, 'size' => 40);
+
+            // 'serialized' means the UI has to present a composite address field
+            if ($this->coltypes['address']['serialized']) {
+                $childprop = array('type' => 'text');
+                $this->coltypes['address']['type'] = 'composite';
+                $this->coltypes['address']['childs'] = array('street' => $childprop, 'locality' => $childprop, 'zipcode' => $childprop, 'country' => $childprop);
+            }
         }
 
         // make sure 'required_fields' is an array