From ae6cf93c84c3584b111f4b9fa3fb4e3f63d37915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 15 Jul 2021 15:31:50 +0200 Subject: Fix default values when loading from config dir By waiting until we've loaded the config dir config before applying the default values. Fixes #8763 --- hugolib/config.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'hugolib/config.go') diff --git a/hugolib/config.go b/hugolib/config.go index 65b269ab6..694f34615 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -78,10 +78,6 @@ 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 { @@ -97,6 +93,10 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid } } + if err := l.applyConfigDefaults(); err != nil { + return l.cfg, configFiles, err + } + l.cfg.SetDefaultMergeStrategy() // We create languages based on the settings, so we need to make sure that -- cgit v1.2.3