From 5b0b034387715a18910a7e574b71afcfae293ecf Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 08 May 2012 03:59:28 -0400
Subject: [PATCH] Fixed PHP warning
---
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 17fb407..b889fb2 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -131,7 +131,7 @@
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'];
--
Gitblit v1.9.1