summaryrefslogtreecommitdiffstats
path: root/tpl/template.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-11-22 09:42:11 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2016-11-22 09:42:11 +0100
commite7d0bc8a7433e39dc22fe5096a0eb663c16c0d6a (patch)
tree8f9683d3ec506a145ccdcf3d6e11c218f58ea096 /tpl/template.go
parent239c75c7f866e8970b794a9e7bac73de46052241 (diff)
Revert "Fix case issues with Params"
This reverts commit 239c75c7f866e8970b794a9e7bac73de46052241. There is a ininite loop in there somewhere on my site that needs to be resolved.
Diffstat (limited to 'tpl/template.go')
-rw-r--r--tpl/template.go29
1 files changed, 9 insertions, 20 deletions
diff --git a/tpl/template.go b/tpl/template.go
index 275ec6b8f..2d8ed2943 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -213,16 +213,11 @@ func (t *GoHTMLTemplate) AddInternalShortcode(name, content string) error {
func (t *GoHTMLTemplate) AddTemplate(name, tpl string) error {
t.checkState()
- templ, err := t.New(name).Parse(tpl)
+ _, err := t.New(name).Parse(tpl)
if err != nil {
t.errors = append(t.errors, &templateErr{name: name, err: err})
- return err
- }
- if err := applyTemplateTransformers(templ); err != nil {
- return err
}
-
- return nil
+ return err
}
func (t *GoHTMLTemplate) AddTemplateFileWithMaster(name, overlayFilename, masterFilename string) error {
@@ -269,11 +264,7 @@ func (t *GoHTMLTemplate) AddTemplateFileWithMaster(name, overlayFilename, master
// The extra lookup is a workaround, see
// * https://github.com/golang/go/issues/16101
// * https://github.com/spf13/hugo/issues/2549
- overlayTpl = overlayTpl.Lookup(overlayTpl.Name())
- if err := applyTemplateTransformers(overlayTpl); err != nil {
- return err
- }
- t.overlays[name] = overlayTpl
+ t.overlays[name] = overlayTpl.Lookup(overlayTpl.Name())
}
return err
@@ -300,12 +291,11 @@ func (t *GoHTMLTemplate) AddAceTemplate(name, basePath, innerPath string, baseCo
t.errors = append(t.errors, &templateErr{name: name, err: err})
return err
}
- templ, err := ace.CompileResultWithTemplate(t.New(name), parsed, nil)
+ _, err = ace.CompileResultWithTemplate(t.New(name), parsed, nil)
if err != nil {
t.errors = append(t.errors, &templateErr{name: name, err: err})
- return err
}
- return applyTemplateTransformers(templ)
+ return err
}
func (t *GoHTMLTemplate) AddTemplateFile(name, baseTemplatePath, path string) error {
@@ -327,12 +317,9 @@ func (t *GoHTMLTemplate) AddTemplateFile(name, baseTemplatePath, path string) er
return err
}
- templ, err := compiler.CompileWithTemplate(t.New(templateName))
- if err != nil {
+ if _, err := compiler.CompileWithTemplate(t.New(templateName)); err != nil {
return err
}
-
- return applyTemplateTransformers(templ)
case ".ace":
var innerContent, baseContent []byte
innerContent, err := afero.ReadFile(hugofs.Source(), path)
@@ -366,6 +353,8 @@ func (t *GoHTMLTemplate) AddTemplateFile(name, baseTemplatePath, path string) er
return t.AddTemplate(name, string(b))
}
+ return nil
+
}
func (t *GoHTMLTemplate) GenerateTemplateNameFrom(base, path string) string {
@@ -478,7 +467,7 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
}
if err := t.AddTemplateFile(tplName, baseTemplatePath, path); err != nil {
- jww.ERROR.Printf("Failed to add template %s in path %s: %s", tplName, path, err)
+ jww.ERROR.Printf("Failed to add template %s: %s", tplName, err)
}
}