summaryrefslogtreecommitdiff
path: root/program/include/rcube_ldap.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-05-08 09:59:28 +0200
committerAleksander Machniak <alec@alec.pl>2012-05-08 09:59:28 +0200
commit5b0b034387715a18910a7e574b71afcfae293ecf (patch)
treed19209d65fec4079be0223f4d453f16d5d223ae4 /program/include/rcube_ldap.php
parentc792b5216eac546abc284b0da008dbe09efea0a4 (diff)
Fixed PHP warning
Diffstat (limited to 'program/include/rcube_ldap.php')
-rw-r--r--program/include/rcube_ldap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 17fb40784..b889fb27a 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -131,7 +131,7 @@ class rcube_ldap extends rcube_addressbook
if ($this->fieldmap['street'] && $this->fieldmap['locality']) {
$this->coltypes['address'] = array(
'limit' => max(1, $this->coltypes['locality']['limit'] + $this->coltypes['address']['limit']),
- 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], $this->coltypes['locality']['subtypes']),
+ 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], (array)$this->coltypes['locality']['subtypes']),
'childs' => array(),
) + (array)$this->coltypes['address'];