Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-05 ba3cd80c0c61e679cef92a1f4f51e645090a1472

 program/include/rcube_ldap.php

@@ -139,6 +139,11 @@
                    unset($this->coltypes[$childcol]);  // remove address child col from global coltypes list
                }
            }

            // at least one address type must be specified
            if (empty($this->coltypes['address']['subtypes'])) {
                $this->coltypes['address']['subtypes'] = array('home');
            }
        }
        else if ($this->coltypes['address']) {
            $this->coltypes['address'] += array('type' => 'textarea', 'childs' => null, 'size' => 40);