aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--render/render.go6
1 files 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)
}
}