mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-12 20:13:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

config: Fix merge of config with map[string]string values.

Browse Source 
Fixes #8679
This commit is contained in:
Bjørn Erik Pedersen
2021-06-22 09:53:37 +02:00
parent 9312059888
commit 4a9d408fe0
9 changed files with 133 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/defaultConfigProvider.go
View File

@@ -163,10 +163,9 @@ func (c *defaultConfigProvider) Set(k string, v interface{}) {
}
switch vv := v.(type) {
case map[string]interface{}:
var p maps.Params = vv
case map[string]interface{}, map[interface{}]interface{}, map[string]string:
p := maps.MustToParamsAndPrepare(vv)
v = p
maps.PrepareParams(p)
}
key, m := c.getNestedKeyAndMap(k, true)
@@ -183,6 +182,16 @@ func (c *defaultConfigProvider) Set(k string, v interface{}) {
m[key] = v
}
// SetDefaults will set values from params if not already set.
func (c *defaultConfigProvider) SetDefaults(params maps.Params) {
maps.PrepareParams(params)
for k, v := range params {
if _, found := c.root[k]; !found {
c.root[k] = v
}
}
}
func (c *defaultConfigProvider) Merge(k string, v interface{}) {
c.mu.Lock()
defer c.mu.Unlock()
@@ -226,10 +235,9 @@ func (c *defaultConfigProvider) Merge(k string, v interface{}) {
}
switch vv := v.(type) {
case map[string]interface{}:
var p maps.Params = vv
case map[string]interface{}, map[interface{}]interface{}, map[string]string:
p := maps.MustToParamsAndPrepare(vv)
v = p
maps.PrepareParams(p)
}
key, m := c.getNestedKeyAndMap(k, true)