From 2e961201be67cc348e7da22ad7c32c87c9f3d30d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 11 May 2010 07:00:08 -0400
Subject: [PATCH] Fixed: FS#1186 - Error in Installer r1728
---
interface/lib/classes/tform.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 35ca443..d296943 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -362,7 +362,7 @@
// If Datasource is set, get the data from there
if(isset($field['datasource']) && is_array($field['datasource'])) {
if(is_array($field["value"])) {
- $field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+ $field["value"] = $field["value"] + $this->getDatasourceData($field, $record);
} else {
$field["value"] = $this->getDatasourceData($field, $record);
}
--
Gitblit v1.9.1