hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PORT PHRAS-1862 to 4.1

Browse Source
This commit is contained in:
Mike Ng
2018-02-28 13:42:43 +04:00
parent ad71cb1ac0
commit 169b4026eb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
View File

@@ -82,13 +82,16 @@ class RegistryFormManipulator
private function filterNullValues(array &$array) private function filterNullValues(array &$array)
{ {
return array_filter($array, function (&$value) { foreach ($array as $key => &$value) {
if (is_array($value)) { if (is_array($value)) {
$value = $this->filterNullValues($value); $this->filterNullValues($value);
}
else if ($key !== 'geonames-server' && $value === null) {
unset($array[$key]);
}
} }
return null !== $value; return $array;
});
} }
private function getDefaultData(array $config) private function getDefaultData(array $config)