Skip to content

Commit

Permalink
tpl/tplimpl: Retain query string and fragment in render-image.html
Browse files Browse the repository at this point in the history
Closes #12468
  • Loading branch information
jmooring authored and bep committed May 10, 2024
1 parent ca9a77e commit 6dfeb9f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
{{- if not $u.IsAbs -}}
{{- with or (.PageInner.Resources.Get $u.Path) (resources.Get $u.Path) -}}
{{- $src = .RelPermalink -}}
{{- with $u.RawQuery -}}
{{- $src = printf "%s?%s" $src . -}}
{{- end -}}
{{- with $u.Fragment -}}
{{- $src = printf "%s#%s" $src . -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $attributes := merge .Attributes (dict "alt" .Text "src" $src "title" (.Title | transform.HTMLEscape)) -}}
Expand Down
18 changes: 11 additions & 7 deletions tpl/tplimpl/render_hook_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,30 +130,34 @@ title: s1/p3
}

// Issue 12203
func TestEmbeddedImageRenderHookMarkdownAttributes(t *testing.T) {
// Issue 12468
func TestEmbeddedImageRenderHook(t *testing.T) {
t.Parallel()

files := `
-- config.toml --
disableKinds = ['page','rss','section','sitemap','taxonomy','term']
baseURL = 'https://example.org/dir/'
disableKinds = ['home','rss','section','sitemap','taxonomy','term']
[markup.goldmark.parser]
wrapStandAloneImageWithinParagraph = false
[markup.goldmark.parser.attribute]
block = false
[markup.goldmark.renderHooks.image]
enableDefault = true
-- content/_index.md --
![alt](a.jpg)
-- content/p1/index.md --
![alt](pixel.png?a=b&c=d#fragment)
{.foo #bar}
-- layouts/index.html --
-- content/p1/pixel.png --
iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-- layouts/_default/single.html --
{{ .Content }}
`

b := hugolib.Test(t, files)
b.AssertFileContent("public/index.html", `<img alt="alt" src="a.jpg">`)
b.AssertFileContent("public/p1/index.html", `<img alt="alt" src="/dir/p1/pixel.png?a=b&c=d#fragment">`)

files = strings.Replace(files, "block = false", "block = true", -1)

b = hugolib.Test(t, files)
b.AssertFileContent("public/index.html", `<img alt="alt" class="foo" id="bar" src="a.jpg">`)
b.AssertFileContent("public/p1/index.html", `<img alt="alt" class="foo" id="bar" src="/dir/p1/pixel.png?a=b&c=d#fragment">`)
}

0 comments on commit 6dfeb9f

Please sign in to comment.