lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync with master

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-13 14:11:37 +00:00
parent b5e671d0df
commit 32359545d3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opnsense/mvc/app/library/OPNsense/Core/Config.php
View File

@ -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 {