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
ISPConfig
ISPConfig 3
Commits
7b35164b
Commit
7b35164b
authored
Nov 21, 2013
by
Marius Cramer
Browse files
Reverted array_merge change
parent
82e2a20f
Changes
1
Show whitespace changes
Inline
Side-by-side
interface/lib/classes/tform.inc.php
View file @
7b35164b
...
...
@@ -146,7 +146,7 @@ class tform {
}
if
(
is_array
(
$wb_global
))
{
$wb
=
array_merge
(
$wb_global
,
$wb
);
$wb
=
$app
->
functions
->
array_merge
(
$wb_global
,
$wb
);
}
if
(
isset
(
$wb_global
))
unset
(
$wb_global
);
...
...
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