projects / brevno-suite / hugo / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25bfa7e)
hugolib: Fix error for non-renderable HTML content with shortcodes
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 10 Feb 2017 10:26:28 +0000 (17:26 +0700)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Fri, 10 Feb 2017 11:57:38 +0000 (18:57 +0700)
This commit re-introduces template lookup order that was accidently removed as
part of the template nonglobal refactoring.

Fixes #3021

hugolib/site_test.go patch | blob | history
tpl/template.go patch | blob | history

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 3f1a8b06670e1a1b3eef0b943f4282f8a4b52a96..483d6ae7188ceafc677846b1441617bd11037d3f 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -436,6 +436,8 @@ func TestSkipRender(t *testing.T) {
                {Name: filepath.FromSlash("sect/doc6.html"), Content: []byte("<!doctype html><html>{{ template \"head_abs\" }}<body>body5</body></html>")},
                {Name: filepath.FromSlash("doc7.html"), Content: []byte("<html><body>doc7 content</body></html>")},
                {Name: filepath.FromSlash("sect/doc8.html"), Content: []byte("---\nmarkup: md\n---\n# title\nsome *content*")},
+               // Issue #3021
+               {Name: filepath.FromSlash("doc9.html"), Content: []byte("<html><body>doc9: {{< myshortcode >}}</body></html>")},
        }
 
        viper.Set("defaultExtension", "html")
@@ -454,6 +456,7 @@ func TestSkipRender(t *testing.T) {
        writeSource(t, fs, filepath.Join("layouts", "_default/single.html"), "{{.Content}}")
        writeSource(t, fs, filepath.Join("layouts", "head"), "<head><script src=\"script.js\"></script></head>")
        writeSource(t, fs, filepath.Join("layouts", "head_abs"), "<head><script src=\"/script.js\"></script></head>")
+       writeSource(t, fs, filepath.Join("layouts", "shortcodes", "myshortcode.html"), "SHORT")
 
        buildSingleSite(t, deps.DepsCfg{Fs: fs}, BuildCfg{})
 
@@ -469,6 +472,7 @@ func TestSkipRender(t *testing.T) {
                {filepath.FromSlash("public/sect/doc6.html"), "<!doctype html><html><head><script src=\"http://auth/bub/script.js\"></script></head><body>body5</body></html>"},
                {filepath.FromSlash("public/doc7.html"), "<html><body>doc7 content</body></html>"},
                {filepath.FromSlash("public/sect/doc8.html"), "\n\n<h1 id=\"title\">title</h1>\n\n<p>some <em>content</em></p>\n"},
+               {filepath.FromSlash("public/doc9.html"), "<html><body>doc9: SHORT</body></html>"},
        }
 
        for _, test := range tests {
diff --git a/tpl/template.go b/tpl/template.go
index 9efb8869ac09cff6bec599ae4cc4e89e4352d4b6..844608014dbc1b57c38e8b54c24c2a1e52376e51 100644 (file)
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -141,7 +141,6 @@ func (t *GoHTMLTemplate) initFuncs(d *deps.Deps) {
                // Hacky, but we need to make sure that the func names are in the global map.
                amber.FuncMap[k] = func() string {
                        panic("should never be invoked")
-                       return ""
                }
        }
 
@@ -197,12 +196,18 @@ func (t *GoHTMLTemplate) ExecuteTemplateToHTML(context interface{}, layouts ...s
 
 func (t *GoHTMLTemplate) Lookup(name string) *template.Template {
 
+       if templ := t.Template.Lookup(name); templ != nil {
+               return templ
+       }
+
        if t.overlays != nil {
                if templ, ok := t.overlays[name]; ok {
                        return templ
                }
        }
 
+       // The clone is used for the non-renderable HTML pages (p.IsRenderable == false) that is parsed
+       // as Go templates late in the build process.
        if t.clone != nil {
                if templ := t.clone.Lookup(name); templ != nil {
                        return templ
Unnamed repository; edit this file 'description' to name the repository.