summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-16 12:00:35 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-16 12:02:52 +0200
commit40b72003fe3abd8c327476fa58dbb2a84c271281 (patch)
tree30f7128fe3b0bb135ce6438d1550f3f4a144ea74 /program/include
parentb7c84a1bb82a8446241517577875afd5f9c3a26c (diff)
Force at least one subtype of address to be specified.
Fixes issue where contact address wasn't displayed at all.
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_ldap.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 9904d7d7d..babd34b60 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -142,6 +142,11 @@ class rcube_ldap extends rcube_addressbook
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);