diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-03 17:27:40 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-08 20:13:39 +0200 |
commit | 7ff0a8ee9fe8d710d407e57faf1fda43bd635f28 (patch) | |
tree | 4baa7d913f735cc1089e465b51ff007014bfe25a /hugolib/page__paginator.go | |
parent | df374851a0683f1446f33a4afef74c42f7d3eaaf (diff) |
Simplify page tree logic
This is preparation for #6041.
For historic reasons, the code for bulding the section tree and the taxonomies were very much separate.
This works, but makes it hard to extend, maintain, and possibly not so fast as it could be.
This simplification also introduces 3 slightly breaking changes, which I suspect most people will be pleased about. See referenced issues:
This commit also switches the radix tree dependency to a mutable implementation: github.com/armon/go-radix.
Fixes #6154
Fixes #6153
Fixes #6152
Diffstat (limited to 'hugolib/page__paginator.go')
-rw-r--r-- | hugolib/page__paginator.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hugolib/page__paginator.go b/hugolib/page__paginator.go index 026546742..20476ecfa 100644 --- a/hugolib/page__paginator.go +++ b/hugolib/page__paginator.go @@ -80,7 +80,17 @@ func (p *pagePaginator) Paginator(options ...interface{}) (*page.Pager, error) { pd := p.source.targetPathDescriptor pd.Type = p.source.outputFormat() - paginator, err := page.Paginate(pd, p.source.Pages(), pagerSize) + + var pages page.Pages + if p.source.IsHome() { + // From Hugo 0.57 we made home.Pages() work like any other + // section. To avoid the default paginators for the home page + // changing in the wild, we make this a special case. + pages = p.source.s.RegularPages() + } else { + pages = p.source.Pages() + } + paginator, err := page.Paginate(pd, pages, pagerSize) if err != nil { initErr = err return |