hugo

commit 4898fb3d64c856c5e0f324e0dfbf3b60da1d1d3a
parent 45d7988f2d0aa95d1a56f4c66342574075cf2963
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Mon,  2 Sep 2019 17:34:02 +0200

Make home.Pages work like any other section

Fixes #6240

Diffstat:
M
hugolib/hugo_smoke_test.go
 | 
2
+-
M
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
@@ -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
@@ -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