From f4ffeea71dd3d044a2628bbb5d6634680667398f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 22 Aug 2021 11:57:37 +0200 Subject: Fix it so disableKinds etc. does not get merged in from theme Unless the merge strategy is set up to do so. For `disableKinds` the current workaround is to make sure the project config has an entry, even if is empty: ``` disableKinds = [] ``` Note that this issue only touches root, non-map config-values that either is not set in project config or in Hugo's defaults. Fixes #8866 --- config/defaultConfigProvider.go | 2 +- config/defaultConfigProvider_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/defaultConfigProvider.go b/config/defaultConfigProvider.go index 2391ec853..0a10d5cc6 100644 --- a/config/defaultConfigProvider.go +++ b/config/defaultConfigProvider.go @@ -275,7 +275,7 @@ func (c *defaultConfigProvider) Merge(k string, v interface{}) { } } // Merge the rest. - c.root.Merge(p) + c.root.MergeRoot(p) for _, k := range keysToDelete { delete(c.root, k) } diff --git a/config/defaultConfigProvider_test.go b/config/defaultConfigProvider_test.go index 7ab8c049a..585ce4c67 100644 --- a/config/defaultConfigProvider_test.go +++ b/config/defaultConfigProvider_test.go @@ -172,7 +172,6 @@ func TestDefaultConfigProvider(t *testing.T) { c.Assert(cfg.Get(""), qt.DeepEquals, maps.Params{ "a": "av", - "b": "bv2", }) }) -- cgit v1.2.3