Unflatten empty customvars of type array & dict correctly

Icinga · Jun 22, 2023 · caf0122 · caf0122
1 parent 1756065
commit caf0122
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/library/Icingadb/Model/CustomvarFlat.php b/library/Icingadb/Model/CustomvarFlat.php
@@ -113,7 +113,10 @@ public function unFlattenVars(Traversable $flattenedVars): array
 
                 $registerValue($data[$step], $source[$step] ?? null, $path, $value);
             } else {
-                $data[$step] = $value;
+                // 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.
+                $data[$step] = $source[$step] ?? $value;
             }
         };
 
@@ -130,6 +133,10 @@ public function unFlattenVars(Traversable $flattenedVars): array
                 $source = [$realName => $var->customvar->value];
 
                 $sourcePath = ltrim(substr($var->flatname, strlen($realName)), '.');
+                if ($sourcePath === '[]') {
+                    $sourcePath = null;
+                }
+
                 $path = array_merge([$realName], $sourcePath ? explode('.', $sourcePath) : []);
             } else {
                 $path = explode('.', $var->flatname);