From 0b91053c9fb5a56a28866a933868b0fc7807b24f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Tue, 28 Feb 2017 09:06:33 +0100
Subject: [PATCH] hugolib: Only consider regular pages in Prev/Next

Fixes #3108
---
 hugolib/hugo_sites_build_test.go | 13 +++++++++++++
 hugolib/site.go                  |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
index 80aea0f75..e917d9f51 100644
--- a/hugolib/hugo_sites_build_test.go
+++ b/hugolib/hugo_sites_build_test.go
@@ -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) {
diff --git a/hugolib/site.go b/hugolib/site.go
index 860fa071d..917080c10 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -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