Fixed a bug in tform library when a value in formdef gets merged with a datasource.

tbrehm · tbrehm · commit bef7752075fe · 2010-08-03T20:07:17.000Z
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
@@ -362,7 +362,7 @@ function getHTML($record, $tab, $action = 'NEW') {
                                         // If Datasource is set, get the data from there
                                         if(isset($field['datasource']) && is_array($field['datasource'])) {
 												if(is_array($field["value"])) {
-													$field["value"] = $field["value"] + $this->getDatasourceData($field, $record);
+													$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
 												} else {
                                                 	$field["value"] = $this->getDatasourceData($field, $record);
 												}

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ function getHTML($record, $tab, $action = 'NEW') {`
`362`	`362`	`// If Datasource is set, get the data from there`
`363`	`363`	`if(isset($field['datasource']) && is_array($field['datasource'])) {`
`364`	`364`	`if(is_array($field["value"])) {`
`365`		`- $field["value"] = $field["value"] + $this->getDatasourceData($field, $record);`
	`365`	`+ $field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));`
`366`	`366`	`} else {`
`367`	`367`	`$field["value"] = $this->getDatasourceData($field, $record);`
`368`	`368`	`}`