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

Fixes #8679

1 files changed, 5 insertions, 5 deletions

diff --git a/hugolib/config.go b/hugolib/config.go
index cad845199..90ac7eb01 100644
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -64,10 +64,6 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
 
 	l := configLoader{ConfigSourceDescriptor: d, cfg: config.New()}
 
-	if err := l.applyConfigDefaults(); err != nil {
-		return l.cfg, configFiles, err
-	}
-
 	for _, name := range d.configFilenames() {
 		var filename string
 		filename, err := l.loadConfig(name)
@@ -78,6 +74,10 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
 		}
 	}
 
+	if err := l.applyConfigDefaults(); err != nil {
+		return l.cfg, configFiles, err
+	}
+
 	if d.AbsConfigDir != "" {
 		dcfg, dirnames, err := config.LoadConfigFromDir(l.Fs, d.AbsConfigDir, l.Environment)
 		if err == nil {
@@ -298,7 +298,7 @@ func (l configLoader) applyConfigDefaults() error {
 		"enableInlineShortcodes":               false,
 	}
 
-	l.cfg.Merge("", defaultSettings)
+	l.cfg.SetDefaults(defaultSettings)
 
 	return nil
 }