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

validate fromArray in config class to ignore empty tags. If for some strange reason the frontend code drops empty tags, we need to ignore them.

Browse Source 
Related to https://github.com/opnsense/core/issues/116
This commit is contained in:
Ad Schellevis 2015-03-29 12:09:54 +02:00
parent 68212c0ccf
commit cb9f82195f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ class Config extends Singleton
// single content item
if (is_array($forceList) && array_key_exists($xmlNode->getName(), $forceList)) {
$result[$xmlNode->getName()] = array();
if ($xmlNode->__toString() != null && trim($xmlNode->__toString()) !== "" ){
if ($xmlNode->__toString() != null && trim($xmlNode->__toString()) !== "") {
$result[$xmlNode->getName()][] = $xmlNode->__toString();
}
} else {
@ -143,8 +143,9 @@ class Config extends Singleton
}
foreach ($source as $itemKey => $itemValue) {
if (is_bool($itemValue) && $itemValue == false) {
// skip empty booleans
if ((is_bool($itemValue) && $itemValue == false) || // skip empty booleans
$itemKey == null || trim($itemKey) == "" // skip empty tag names
) {
continue;
}
if (is_numeric($itemKey)) {