blogs/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2026-08-24 15:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic on edit of legacy mapped template names that's also a valid path in the new setup

Browse Source 
This mapping was added in Hugo `v0.146.0`.

Fixes #14740
This commit is contained in:
Bjørn Erik Pedersen
2026-04-08 12:07:37 +02:00
parent 161d0d4757
commit c48551677c
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tpl/tplimpl/templates.go
+5 -5
View File
@@ -45,8 +45,8 @@ var embeddedTemplatesAliases = map[string][]string{
"_shortcodes/twitter.html": {"_shortcodes/tweet.html"},
}
func (s *TemplateStore) parseTemplate(ti *TemplInfo, replace bool) error {
err := s.tns.doParseTemplate(ti, replace)
func (s *TemplateStore) parseTemplate(ti *TemplInfo) error {
err := s.tns.doParseTemplate(ti)
if err != nil {
return s.addFileContext(ti, "parse of template failed", err)
}
@@ -69,7 +69,7 @@ func (t *templateNamespace) newBlankTemplate(ti *TemplInfo) tpl.Template {
return tt
}
func (t *templateNamespace) doParseTemplate(ti *TemplInfo, replace bool) error {
func (t *templateNamespace) doParseTemplate(ti *TemplInfo) error {
if !ti.noBaseOf || ti.category == CategoryBaseof {
// Delay parsing until we have the base template.
return nil
@@ -84,7 +84,7 @@ func (t *templateNamespace) doParseTemplate(ti *TemplInfo, replace bool) error {
if ti.D.IsPlainText {
prototype := t.parseText
if !replace && prototype.Lookup(name) != nil {
if prototype.Lookup(name) != nil {
name += "-" + strconv.FormatUint(t.nameCounter.Add(1), 10)
}
templ, err = prototype.New(name).Parse(ti.content)
@@ -93,7 +93,7 @@ func (t *templateNamespace) doParseTemplate(ti *TemplInfo, replace bool) error {
}
} else {
prototype := t.parseHTML
if !replace && prototype.Lookup(name) != nil {
if prototype.Lookup(name) != nil {
name += "-" + strconv.FormatUint(t.nameCounter.Add(1), 10)
}
templ, err = prototype.New(name).Parse(ti.content)
tpl/tplimpl/templatestore.go
+6 -6
View File
@@ -149,7 +149,7 @@ func NewStore(opts StoreOptions, siteOpts SiteOptions) (*TemplateStore, error) {
if err := s.insertEmbedded(); err != nil {
return nil, err
}
if err := s.parseTemplates(false); err != nil {
if err := s.parseTemplates(); err != nil {
return nil, err
}
if err := s.extractInlinePartials(false); err != nil {
@@ -740,7 +740,7 @@ func (s *TemplateStore) RefreshFiles(include func(fi hugofs.FileMetaInfo) bool)
if err := s.createTemplatesSnapshot(); err != nil {
return err
}
if err := s.parseTemplates(true); err != nil {
if err := s.parseTemplates(); err != nil {
return err
}
if err := s.extractInlinePartials(true); err != nil {
@@ -1627,7 +1627,7 @@ func (s *TemplateStore) addTransformedTemplateSetTree(this *TemplInfo, root *par
return tree, nil
}
func (s *TemplateStore) parseTemplates(replace bool) error {
func (s *TemplateStore) parseTemplates() error {
if err := func() error {
// Read and parse all templates.
for _, v := range s.treeMain.All() {
@@ -1635,7 +1635,7 @@ func (s *TemplateStore) parseTemplates(replace bool) error {
if vv.state == processingStateTransformed {
continue
}
if err := s.parseTemplate(vv, replace); err != nil {
if err := s.parseTemplate(vv); err != nil {
return err
}
}
@@ -1655,7 +1655,7 @@ func (s *TemplateStore) parseTemplates(replace bool) error {
// The regular expression used to detect if a template needs a base template has some
// rare false positives. Assume we don't need one.
vv.noBaseOf = true
if err := s.parseTemplate(vv, replace); err != nil {
if err := s.parseTemplate(vv); err != nil {
return err
}
continue
@@ -1684,7 +1684,7 @@ func (s *TemplateStore) parseTemplates(replace bool) error {
if vvv.state == processingStateTransformed {
continue
}
if err := s.parseTemplate(vvv, replace); err != nil {
if err := s.parseTemplate(vvv); err != nil {
return err
}
}