hugolib: Only consider regular pages in Prev/Next
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 28 Feb 2017 08:06:33 +0000 (09:06 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 28 Feb 2017 08:07:00 +0000 (09:07 +0100)
Fixes #3108

hugolib/hugo_sites_build_test.go
hugolib/site.go

index 80aea0f751538033301eadc27cbbc4fa2faa8dc5..e917d9f51d545fd1b7fa6cbde3c4678178b82c5f 100644 (file)
@@ -370,6 +370,19 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
        require.Equal(t, "Home", enSite.Menus["main"].ByName()[0].Name)
        require.Equal(t, "Heim", nnSite.Menus["main"].ByName()[0].Name)
 
+       // Issue #3108
+       next := enSite.RegularPages[0].Next
+       require.NotNil(t, next)
+       require.Equal(t, KindPage, next.Kind)
+
+       for {
+               if next == nil {
+                       break
+               }
+               require.Equal(t, KindPage, next.Kind)
+               next = next.Next
+       }
+
 }
 
 func TestMultiSitesRebuild(t *testing.T) {
index 860fa071d1a69b16dead301ac81fb5852d451168..917080c102913ad11b8c331f3cf23e683b9ffae9 100644 (file)
@@ -824,13 +824,13 @@ func (s *Site) process(config BuildCfg) (err error) {
 func (s *Site) setupSitePages() {
        var siteLastChange time.Time
 
-       for i, page := range s.Pages {
-               if i < len(s.Pages)-1 {
-                       page.Next = s.Pages[i+1]
+       for i, page := range s.RegularPages {
+               if i < len(s.RegularPages)-1 {
+                       page.Next = s.RegularPages[i+1]
                }
 
                if i > 0 {
-                       page.Prev = s.Pages[i-1]
+                       page.Prev = s.RegularPages[i-1]
                }
 
                // Determine Site.Info.LastChange