Don't use customvar values from customvar table other than for empt…

…y `array` & `dictionary`
Icinga · Oct 13, 2023 · 0f380c8 · 0f380c8
1 parent 701797e
commit 0f380c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Icingadb/Model/CustomvarFlat.php b/library/Icingadb/Model/CustomvarFlat.php
@@ -126,7 +126,7 @@ public function unFlattenVars(Traversable $flattenedVars): array
                 // Since empty custom vars of type dictionaries and arrays have null values in customvar_flat table,
                 // we won't be able to render them as such. Therefore, we have to use the value of the `customvar`
                 // table if it's not null, otherwise the current value, which is a "null" string.
-                $data[$step] = $source[$step] ?? $value;
+                $data[$step] = $value === null && ($source[$step] ?? null) === [] ? $source[$step] : $value;
             }
         };
 

diff --git a/test/php/library/Icingadb/Model/CustomvarFlatTest.php b/test/php/library/Icingadb/Model/CustomvarFlatTest.php
@@ -70,7 +70,7 @@ class CustomvarFlatTest extends TestCase
         "example.0.org" => "xyz",
         "ob" => [
             "je" => [
-                "ct" => "tcejbo"
+                "ct" => "***"
             ]
         ],
         "real_list" => [