ChannelForm: Store cleared default options as empty string

Icinga · Jul 15, 2024 · 1079dc6 · 1079dc6
1 parent 15cd72b
commit 1079dc6
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/application/forms/ChannelForm.php b/application/forms/ChannelForm.php
@@ -397,17 +397,19 @@ protected function fromCurrentLocale(array $localeMap): ?string
      */
     private function filterConfig(array $config): array
     {
-        return array_filter(
-            $config,
-            function ($configItem, $key) {
-                if (isset($this->defaultChannelOptions[$key])) {
-                    return $this->defaultChannelOptions[$key] !== $configItem;
+        foreach ($config as $key => $value) {
+            if (isset($this->defaultChannelOptions[$key])) {
+                if ($value === null) {
+                    $config[$key] = '';
+                } elseif ($this->defaultChannelOptions[$key] === $value) {
+                    unset($config[$key]);
                 }
+            } elseif ($value === null) {
+                unset($config[$key]);
+            }
+        }
 
-                return $configItem !== null;
-            },
-            ARRAY_FILTER_USE_BOTH
-        );
+        return $config;
     }
 
     /**