Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
1d7709a3
Commit
1d7709a3
authored
Jan 26, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(legacy) xmlrpc optimize array merge
parent
93900e30
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
legacy.inc
src/etc/inc/xmlrpc/legacy.inc
+4
-3
No files found.
src/etc/inc/xmlrpc/legacy.inc
View file @
1d7709a3
...
@@ -76,7 +76,7 @@ function does_vip_exist($vip) {
...
@@ -76,7 +76,7 @@ function does_vip_exist($vip) {
/**
/**
* merge attributes from source array to destination
* merge attributes from source array to destination
* updates leaves and overwrites
arrays containing a single entry
(container types).
* updates leaves and overwrites
sequenced arrays
(container types).
* @param array $cnf_source source data
* @param array $cnf_source source data
* @param array $cnf_dest target
* @param array $cnf_dest target
*/
*/
...
@@ -84,8 +84,9 @@ function merge_config_attributes(&$cnf_source, &$cnf_dest)
...
@@ -84,8 +84,9 @@ function merge_config_attributes(&$cnf_source, &$cnf_dest)
{
{
foreach
(
$cnf_source
as
$cnf_key
=>
&
$cnf_value
)
{
foreach
(
$cnf_source
as
$cnf_key
=>
&
$cnf_value
)
{
if
(
is_array
(
$cnf_value
))
{
if
(
is_array
(
$cnf_value
))
{
if
(
!
isset
(
$cnf_dest
[
$cnf_key
])
||
!
is_array
(
$cnf_dest
[
$cnf_key
])
||
count
(
$cnf_dest
[
$cnf_key
])
==
1
)
{
if
(
!
isset
(
$cnf_dest
[
$cnf_key
])
||
!
is_array
(
$cnf_dest
[
$cnf_key
])
||
// (re)set destination array when new or containing only one target item
(
count
(
$cnf_dest
[
$cnf_key
])
>
0
&&
isset
(
$cnf_dest
[
$cnf_key
][
0
])))
{
// (re)set destination array when new or containing a sequenced list of items
$cnf_dest
[
$cnf_key
]
=
array
();
$cnf_dest
[
$cnf_key
]
=
array
();
}
}
merge_config_attributes
(
$cnf_value
,
$cnf_dest
[
$cnf_key
]);
merge_config_attributes
(
$cnf_value
,
$cnf_dest
[
$cnf_key
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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