diff options
Diffstat (limited to 'hugolib')
| -rw-r--r-- | hugolib/config.go | 4 | ||||
| -rw-r--r-- | hugolib/configdir_test.go | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/hugolib/config.go b/hugolib/config.go index 5b56333df..6a1de32be 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -283,6 +283,10 @@ func (l configLoader) loadConfigFromConfigDir(v *viper.Viper) ([]string, error) return nil } + if !config.IsValidConfigFilename(path) { + return nil + } + name := helpers.Filename(filepath.Base(path)) item, err := metadecoders.Default.UnmarshalFileToMap(sourceFs, path) diff --git a/hugolib/configdir_test.go b/hugolib/configdir_test.go index 80fcda61f..c1afbb14e 100644 --- a/hugolib/configdir_test.go +++ b/hugolib/configdir_test.go @@ -97,7 +97,9 @@ p3 = "p3params_no_production" fb = fb.WithWorkingDir("config/development") // This is set in all the config.toml variants above, but this will win. - fb.Add("config.toml", `paginatePath = "pag_development"`) + fb.Add("config.TOML", `paginatePath = "pag_development"`) + // Issue #5646 + fb.Add("config.toml.swp", `p3 = "paginatePath = "nono"`) fb.Add("params.no.toml", `p3 = "p3params_no_development"`) fb.Add("params.toml", `p3 = "p3params_development"`) |