Commit bef77520 authored by tbrehm's avatar tbrehm
Browse files

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

parent 7870327d
......@@ -362,7 +362,7 @@ class tform {
// 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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment