Skip to content

O
OpnSense
Commit 32359545 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

sync with master

parent b5e671d0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
src/opnsense/mvc/app/library/OPNsense/Core/Config.php
View file @ 32359545
......@@ -93,7 +93,8 @@ class Config extends Singleton
$old_content = $result[$xmlNode->getName()];
// check if array content is associative, if move items to list
if (array_keys($old_content) !== range(0, count($old_content) - 1) ||
array_key_exists($xmlNode->getName(), $forceList)) {
(is_array($forceList) && array_key_exists($xmlNode->getName(), $forceList))
) {
$result[$xmlNode->getName()] = array();
$result[$xmlNode->getName()][] = $old_content;
}
......@@ -113,7 +114,7 @@ class Config extends Singleton
$result[$xmlNode->getName()][] = $xmlNode->__toString();
} else {
// single content item
if (array_key_exists($xmlNode->getName(), $forceList)) {
if (is_array($forceList) && array_key_exists($xmlNode->getName(), $forceList)) {
$result[$xmlNode->getName()] = array();
$result[$xmlNode->getName()][] = $xmlNode->__toString();
} else {
......
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

Technounit-GROUP 2023