From 40da544bc61f7791d2287de4315f1ad0115d1467 Mon Sep 17 00:00:00 2001 From: Adam Mathes Date: Sun, 5 Jan 2025 15:49:34 -0800 Subject: actually that breaks too much stuff, back out that change and fix later --- render/render.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/render/render.go b/render/render.go index 9e829ab..b8892b1 100644 --- a/render/render.go +++ b/render/render.go @@ -66,7 +66,7 @@ func Init() { "SiteURL": SiteURL, } - // base := path.Join(config.Config.TmplDir, BASE_TEMPLATE) + base := path.Join(config.Config.TmplDir, BASE_TEMPLATE) for _, t := range ts { tf := filepath.Base(t) @@ -74,13 +74,13 @@ func Init() { // templates[tf] = template.Must(template.ParseFiles(t, base)) tx := template.New("t").Funcs(tmplFuncs) - // templates[tf], err = tx.ParseFiles(base, t, (ts...)) - templates[tf], err = tx.ParseGlob(config.Config.TmplDir + "/*") + templates[tf], err = tx.ParseFiles(base, t) if err != nil { // temporary files can confuse this, especially when // running the file system watcher so we silently // ignore any templates that disappeared since we started // since this is usually not a real error condition + log.Println(err) delete(templates, tf) } } -- cgit v1.2.3