mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-17 21:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Fix it so we always prefer internal codeblock rendering over render-codeblock-foo.html and similar

Browse Source 
Fixes #13651
This commit is contained in:
Bjørn Erik Pedersen
2025-04-25 08:31:26 +02:00
parent 5c491409d3
commit 07983e04e2
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tpl/tplimpl/templatedescriptor.go
View File

@@ -130,17 +130,12 @@ func (this TemplateDescriptor) doCompare(category Category, isEmbedded bool, def
// One example of variant1 and 2 is for render codeblocks:
// variant1=codeblock, variant2=go (language).
if other.Variant1 != "" && other.Variant1 != this.Variant1 {
return w
}
if isEmbedded {
if other.Variant2 != "" && other.Variant2 != this.Variant2 {
if other.Variant1 != "" {
if other.Variant1 != this.Variant1 {
return w
}
} else {
// If both are set and different, no match.
if other.Variant2 != "" && this.Variant2 != "" && other.Variant2 != this.Variant2 {
if other.Variant2 != "" && other.Variant2 != this.Variant2 {
return w
}
}