hugo

commit c7acc318b5f48bad1af18f134d0e9308879abd17
parent eaba04e82bdfc5d4c29e970f11b4aab9cc0efeaa
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Sun,  6 Mar 2016 16:33:32 +0100

Add some missing resets on rebuild

Fixes #1928
Fixes #1929

Diffstat:
M
hugolib/site.go
 | 
14
++++++++++++++

1 file changed, 14 insertions(+), 0 deletions(-)
diff --git a/hugolib/site.go b/hugolib/site.go
@@ -469,6 +469,9 @@ func (s *Site) ReBuild(events []fsnotify.Event) error {
 		s.ReadDataFromSourceFS()
 	}
 
+	// we reuse the state, so have to do some cleanup before we can rebuild.
+	s.resetPageBuildState()
+
 	// If a content file changes, we need to reload only it and re-render the entire site.
 	if len(sourceChanged) > 0 {
 
@@ -1303,6 +1306,17 @@ func (s *Site) assembleTaxonomies() {
 	s.Info.Sections = s.Sections
 }
 
+// Prepare pages for a new full build.
+func (s *Site) resetPageBuildState() {
+
+	s.Info.paginationPageCount = 0
+
+	for _, p := range s.Pages {
+		p.scratch = newScratch()
+
+	}
+}
+
 func (s *Site) assembleSections() {
 	for i, p := range s.Pages {
 		s.Sections.Add(p.Section(), WeightedPage{s.Pages[i].Weight, s.Pages[i]}, s.Info.preserveTaxonomyNames)