Skip to content

Commit

Permalink
Fix mixed case Page params handling in content adapters
Browse files Browse the repository at this point in the history
Fixes #12497
  • Loading branch information
bep committed May 15, 2024
1 parent 1aacfce commit 39cf906
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
24 changes: 24 additions & 0 deletions hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -494,3 +494,27 @@ disableKinds = ['home','section','rss','sitemap','taxonomy','term']

b.AssertFileExists("public/s-1.2.3/p-4.5.6/index.html", true)
}

func TestPagesFromGoParamsIssue12497(t *testing.T) {
t.Parallel()

files := `
-- hugo.toml --
disableKinds = ['home','section','rss','sitemap','taxonomy','term']
-- content/_content.gotmpl --
{{ .AddPage (dict "path" "p1" "title" "p1" "params" (dict "paraM1" "param1v" )) }}
{{ .AddResource (dict "path" "p1/data1.yaml" "content" (dict "value" "data1" ) "params" (dict "paraM1" "param1v" )) }}
-- layouts/_default/single.html --
{{ .Title }}|{{ .Params.paraM1 }}
{{ range .Resources }}
{{ .Name }}|{{ .Params.paraM1 }}
{{ end }}
`

b := hugolib.Test(t, files)

b.AssertFileContent("public/p1/index.html",
"p1|param1v",
"data1.yaml|param1v",
)
}
5 changes: 5 additions & 0 deletions resources/page/pagemeta/page_frontmatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ func (p *PageConfig) Compile(basePath string, pagesFromData bool, ext string, lo
p.Path = path.Join(basePath, p.Path)
}

if p.Params == nil {
p.Params = make(maps.Params)
}
maps.PrepareParams(p.Params)

if p.Content.Markup == "" && p.Content.MediaType == "" {
if ext == "" {
ext = "md"
Expand Down

0 comments on commit 39cf906

Please sign in to comment.