fixed #656. Templates work properly when watching.

diff --git a/hugolib/site.go b/hugolib/site.go
index dd02d79f5d50baa6c6ac82fb86505ecf08d0855a..b725cc4112f4ada12fad9d24853e05aa66efa402 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -167,7 +167,7 @@ func (s *Site) Analyze() {
 }
 
 func (s *Site) prepTemplates() {
-       s.Tmpl = tpl.T()
+       s.Tmpl = tpl.InitializeT()
        s.Tmpl.LoadTemplates(s.absLayoutDir())
        if s.hasTheme() {
                s.Tmpl.LoadTemplatesWithPrefix(s.absThemeDir()+"/layouts", "theme")

diff --git a/tpl/template.go b/tpl/template.go
index b79b478eb34d5a93080f29bf20daac0711581dab..b536c46260bbe8830fe45d663c46b6bd970fc7e4 100644 (file)
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -66,6 +66,12 @@ func T() Template {
        return tmpl
 }
 
+// Resets the internal template state to it's initial state
+func InitializeT() Template {
+       tmpl = New()
+       return tmpl
+}
+
 // Return a new Hugo Template System
 // With all the additional features, templates & functions
 func New() Template {