From 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Nov 2010 08:16:10 -0500
Subject: [PATCH] Merged revisions 2095-2129 which contain bugfixes from stable branch.
---
interface/lib/classes/tform.inc.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index b9a417c..4f9b8a9 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -362,7 +362,8 @@
// 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"] = 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