From 28031b0897d7b0f216f60983cb55bd62cc0e06bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Thu, 17 Nov 2016 10:29:11 +0100 Subject: [PATCH] node to page: Only return regular pages in home.Data.Pages Returning all types is both confusing and too breaking. All page types can be fetched in .Site.Pages. Updates #2297 --- hugolib/node_as_page_test.go | 6 +++--- hugolib/page.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hugolib/node_as_page_test.go b/hugolib/node_as_page_test.go index 19c374572..a4fd7830b 100644 --- a/hugolib/node_as_page_test.go +++ b/hugolib/node_as_page_test.go @@ -67,7 +67,7 @@ func TestNodesAsPage(t *testing.T) { assertFileContent(t, filepath.Join("public", "index.html"), false, "Index Title: Home Sweet Home!", "Home Content!", - "# Pages: 9", + "# Pages: 4", "Date: 2009-01-02", "Lastmod: 2009-01-03", "GetPage: Section1 ", @@ -184,8 +184,8 @@ func TestNodesWithNoContentFile(t *testing.T) { require.Len(t, homePages, 1) homePage := homePages[0] - require.Len(t, homePage.Data["Pages"], 9) - require.Len(t, homePage.Pages, 9) // Alias + require.Len(t, homePage.Data["Pages"], 4) + require.Len(t, homePage.Pages, 4) require.True(t, homePage.Path() == "") assertFileContent(t, filepath.Join("public", "index.html"), false, diff --git a/hugolib/page.go b/hugolib/page.go index ec99e383c..6d549273c 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -1466,7 +1466,7 @@ func (p *Page) prepareData(s *Site) error { switch p.Kind { case KindPage: case KindHome: - pages = s.findPagesByKindNotIn(KindHome, s.Pages) + pages = s.RegularPages case KindSection: sectionData, ok := s.Sections[p.sections[0]] if !ok {