tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

ConfigForm: Fix that empty values are not handled correctly

Browse Source 
refs #2751
This commit is contained in:
Noah Hilverling 2017-02-13 16:52:52 +01:00 committed by Eric Lippmann
parent e41f4504a1
commit bf20611fd4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/forms/ConfigForm.php
View File

@ -58,7 +58,7 @@ class ConfigForm extends Form
{ {
$sections = array(); $sections = array();
foreach ($this->getValues() as $sectionAndPropertyName => $value) { foreach ($this->getValues() as $sectionAndPropertyName => $value) {
if (empty($value)) { if ($value === '' || (is_array($value) && empty($value))) {
$value = null; // Causes the config writer to unset it $value = null; // Causes the config writer to unset it
} }
@ -137,8 +137,6 @@ class ConfigForm extends Form
*/ */
public static function transformEmptyValuesToNull(array $values) public static function transformEmptyValuesToNull(array $values)
{ {
return array_map(function ($v) { return array_map(function ($v) { return ($v === '' || (is_array($v) && empty($v))) ? null : $v; }, $values);
return empty($v) ? null : $v;
}, $values);
} }
} }