Do not store null for channel options (#230)

Icinga · Jul 15, 2024 · b377ae1 · b377ae1
2 parents 1bd9f93 + 1079dc6
commit b377ae1
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/application/forms/ChannelForm.php b/application/forms/ChannelForm.php
@@ -218,7 +218,7 @@ public function editChannel(): void
         $storedValues = $this->fetchDbValues();
 
         $channel['config'] = json_encode($this->filterConfig($channel['config']));
-        $storedValues['config'] = json_encode($this->filterConfig($storedValues['config']));
+        $storedValues['config'] = json_encode($storedValues['config']);
 
         if (! empty(array_diff_assoc($channel, $storedValues))) {
             $channel['changed_at'] = time() * 1000;
@@ -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;
     }
 
     /**