From 4898fb3d64c856c5e0f324e0dfbf3b60da1d1d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 2 Sep 2019 17:34:02 +0200 Subject: [PATCH] Make home.Pages work like any other section Fixes #6240 --- hugolib/hugo_smoke_test.go | 2 +- hugolib/page.go | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/hugolib/hugo_smoke_test.go b/hugolib/hugo_smoke_test.go index 2121738a9..539e79729 100644 --- a/hugolib/hugo_smoke_test.go +++ b/hugolib/hugo_smoke_test.go @@ -193,7 +193,7 @@ Some **Markdown** in JSON shortcode. b.AssertFileContent("public/index.html", "home|In English", "Site params: Rules", - "Pages: Pages(18)|Data Pages: Pages(18)", + "Pages: Pages(6)|Data Pages: Pages(6)", "Paginator: 1", "First Site: In English", "RelPermalink: /", diff --git a/hugolib/page.go b/hugolib/page.go index f08e309d4..306ca7b0f 100644 --- a/hugolib/page.go +++ b/hugolib/page.go @@ -146,9 +146,7 @@ func (p *pageState) RegularPages() page.Pages { switch p.Kind() { case page.KindPage: - case page.KindHome: - pages = p.s.RegularPages() - case page.KindSection, page.KindTaxonomyTerm: + case page.KindSection, page.KindHome, page.KindTaxonomyTerm: pages = p.getPages() case page.KindTaxonomy: all := p.Pages() @@ -174,12 +172,7 @@ func (p *pageState) Pages() page.Pages { switch p.Kind() { case page.KindPage: - case page.KindHome: - // See https://github.com/gohugoio/hugo/issues/6238 - // Note: When making the change below, also remember RegularPages. - p.s.DistinctWarningLog.Println(`In the next Hugo version (0.58.0) we will change how $home.Pages behaves. If you want to list all regular pages, replace .Pages or .Data.Pages with .Site.RegularPages in your home page template.`) - pages = p.s.RegularPages() - case page.KindSection: + case page.KindSection, page.KindHome: pages = p.getPagesAndSections() case page.KindTaxonomy: termInfo := p.bucket