mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-14 20:37:55 -05:00
config: Remove unexpected _merge keys introduced in author and social maps
Fixes #11083
This commit is contained in:
parent
f210188da3
commit
b7dc93ca11
2 changed files with 10 additions and 2 deletions
|
@ -336,14 +336,14 @@ var allDecoderSetups = map[string]decodeWeight{
|
|||
"author": {
|
||||
key: "author",
|
||||
decode: func(d decodeWeight, p decodeConfig) error {
|
||||
p.c.Author = p.p.GetStringMap(d.key)
|
||||
p.c.Author = maps.CleanConfigStringMap(p.p.GetStringMap(d.key))
|
||||
return nil
|
||||
},
|
||||
},
|
||||
"social": {
|
||||
key: "social",
|
||||
decode: func(d decodeWeight, p decodeConfig) error {
|
||||
p.c.Social = p.p.GetStringMapString(d.key)
|
||||
p.c.Social = maps.CleanConfigStringMapString(p.p.GetStringMapString(d.key))
|
||||
return nil
|
||||
},
|
||||
},
|
||||
|
|
|
@ -695,6 +695,10 @@ func TestHugoConfig(t *testing.T) {
|
|||
filesTemplate := `
|
||||
-- hugo.toml --
|
||||
theme = "mytheme"
|
||||
[social]
|
||||
twitter = "bepsays"
|
||||
[author]
|
||||
name = "bep"
|
||||
[params]
|
||||
rootparam = "rootvalue"
|
||||
-- config/_default/hugo.toml --
|
||||
|
@ -711,6 +715,8 @@ rootparam: {{ site.Params.rootparam }}
|
|||
rootconfigparam: {{ site.Params.rootconfigparam }}
|
||||
themeparam: {{ site.Params.themeparam }}
|
||||
themeconfigdirparam: {{ site.Params.themeconfigdirparam }}
|
||||
social: {{ site.Social }}
|
||||
author: {{ site.Author }}
|
||||
|
||||
|
||||
`
|
||||
|
@ -735,6 +741,8 @@ themeconfigdirparam: {{ site.Params.themeconfigdirparam }}
|
|||
"rootconfigparam: rootconfigvalue",
|
||||
"themeparam: themevalue",
|
||||
"themeconfigdirparam: themeconfigdirvalue",
|
||||
"social: map[twitter:bepsays]",
|
||||
"author: map[name:bep]",
|
||||
)
|
||||
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue