diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-05-08 09:59:28 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-05-08 12:16:58 +0200 |
| commit | ec23abec1103a452fa6b4f75077020df0785eef1 (patch) | |
| tree | a6230d455685e5d8d23f126bc31ceaa684c2327c /program | |
| parent | d8d75401f5121d2a162bee96efee956d44b454be (diff) | |
Fixed PHP warning
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_ldap.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index c14fd0e95..2c4497733 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -132,7 +132,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']; |