Skip to content

Commit 8af0474

Browse files
jmooringArty2
authored andcommitted
tpl/tplimpl: Use plain text for image render hook alt attribute
Co-authored-by: Heracles <email@heracl.es>
1 parent dde9d9d commit 8af0474

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

hugolib/content_render_hooks_test.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,18 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA
246246
func TestRenderHooksDefaultEscape(t *testing.T) {
247247
files := `
248248
-- hugo.toml --
249-
[markup.goldmark.renderHooks]
249+
[markup.goldmark.extensions.typographer]
250+
disable = true
250251
[markup.goldmark.renderHooks.image]
251-
enableDefault = ENABLE
252+
enableDefault = ENABLE
252253
[markup.goldmark.renderHooks.link]
253254
enableDefault = ENABLE
254255
[markup.goldmark.parser]
255256
wrapStandAloneImageWithinParagraph = false
256257
[markup.goldmark.parser.attribute]
257258
block = true
258259
title = true
260+
259261
-- content/_index.md --
260262
---
261263
title: "Home"
@@ -279,7 +281,7 @@ Image: ![alt-"<>&](/destination-"<> 'title-"<>&')
279281
if enabled {
280282
b.AssertFileContent("public/index.html",
281283
"Link: <a href=\"/destination-%22%3C%3E\" title=\"title-&#34;&lt;&gt;&amp;\">text-&quot;&lt;&gt;&amp;</a>",
282-
"img src=\"/destination-%22%3C%3E\" alt=\"alt-&quot;&lt;&gt;&amp;\" title=\"title-&#34;&lt;&gt;&amp;\">",
284+
"img src=\"/destination-%22%3C%3E\" alt=\"alt-&#34;&lt;&gt;&amp;\" title=\"title-&#34;&lt;&gt;&amp;\">",
283285
"&gt;&lt;script&gt;",
284286
)
285287
} else {

tpl/tplimpl/embedded/templates/_default/_markup/render-image.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{{- end -}}
1313
{{- end -}}
1414
{{- end -}}
15-
<img src="{{ $src }}" alt="{{ .Text }}"
15+
<img src="{{ $src }}" alt="{{ .PlainText }}"
1616
{{- with .Title }} title="{{ . }}" {{- end -}}
1717
{{- range $k, $v := .Attributes -}}
1818
{{- if $v -}}

tpl/tplimpl/render_hook_integration_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ func TestEmbeddedImageRenderHook(t *testing.T) {
146146
-- config.toml --
147147
baseURL = 'https://example.org/dir/'
148148
disableKinds = ['home','rss','section','sitemap','taxonomy','term']
149+
[markup.goldmark.extensions.typographer]
150+
disable = true
149151
[markup.goldmark.parser]
150152
wrapStandAloneImageWithinParagraph = false
151153
[markup.goldmark.parser.attribute]
@@ -174,7 +176,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA
174176
b.AssertFileContent("public/p1/index.html",
175177
`<img src="" alt="">`,
176178
`<img src="/dir/p1/pixel.png" alt="alt1">`,
177-
`<img src="/dir/p1/pixel.png" alt="alt2-&amp;&lt;&gt;&rsquo;" title="&amp;&lt;&gt;&#39;">`,
179+
`<img src="/dir/p1/pixel.png" alt="alt2-&amp;&lt;&gt;&#39;" title="&amp;&lt;&gt;&#39;">`,
178180
`<img src="/dir/p1/pixel.png?a=b&amp;c=d#fragment" alt="alt3">`,
179181
`<img src="/dir/p1/pixel.png" alt="alt4">`,
180182
)
@@ -185,7 +187,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA
185187
b.AssertFileContent("public/p1/index.html",
186188
`<img src="" alt="">`,
187189
`<img src="/dir/p1/pixel.png" alt="alt1">`,
188-
`<img src="/dir/p1/pixel.png" alt="alt2-&amp;&lt;&gt;&rsquo;" title="&amp;&lt;&gt;&#39;">`,
190+
`<img src="/dir/p1/pixel.png" alt="alt2-&amp;&lt;&gt;&#39;" title="&amp;&lt;&gt;&#39;">`,
189191
`<img src="/dir/p1/pixel.png?a=b&amp;c=d#fragment" alt="alt3" class="foo" id="bar">`,
190192
`<img src="/dir/p1/pixel.png" alt="alt4" id="&#34;&gt;&lt;script&gt;alert()&lt;/script&gt;">`,
191193
)

0 commit comments

Comments
 (0)