Make language merging of markup etc. config without values in the root

Updates #10953
This commit is contained in:
Bjørn Erik Pedersen
2023-05-20 11:17:43 +02:00
parent 150d190ff0
commit 4f085e80da
3 changed files with 60 additions and 18 deletions

View File

@@ -214,22 +214,6 @@ func (l configLoader) normalizeCfg(cfg config.Provider) error {
cfg.Set("minify", maps.Params{"minifyOutput": true})
}
// Simplify later merge.
languages := cfg.GetStringMap("languages")
for _, v := range languages {
switch m := v.(type) {
case maps.Params:
// params have merge strategy deep by default.
// The languages config key has strategy none by default.
// This means that if these two sections does not exist on the left side,
// they will not get merged in, so just create some empty maps.
if _, ok := m["params"]; !ok {
m["params"] = maps.Params{}
}
}
}
return nil
}