fixed #656. Templates work properly when watching.

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")

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 {