config: Remove unexpected _merge keys introduced in author and social maps

Fixes #11083

diff --git a/config/allconfig/alldecoders.go b/config/allconfig/alldecoders.go
index b45bd1e11be08c2b2ab16c4e99f347b1214f44e9..1c8573f3d69dea556174cbcf3540ed1586e040f5 100644 (file)
--- a/config/allconfig/alldecoders.go
+++ b/config/allconfig/alldecoders.go
@@ -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
                },
        },

diff --git a/hugolib/config_test.go b/hugolib/config_test.go
index 3b137d8d67358f47857a70e43a288540a2e41996..7f278f00a8c67d5eab6a5cf9ba99131c99895420 100644 (file)
--- a/hugolib/config_test.go
+++ b/hugolib/config_test.go
@@ -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]",
                        )
 
                })