Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guilherme Filippo
ISPConfig 3
Commits
bef77520
Commit
bef77520
authored
Aug 03, 2010
by
tbrehm
Browse files
Fixed a bug in tform library when a value in formdef gets merged with a datasource.
parent
7870327d
Changes
1
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/tform.inc.php
View file @
bef77520
...
...
@@ -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
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment