github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "hugolib: Prepare child page resources before the page itself"

Browse source 
This reverts commit 3238e14fdf.
This commit is contained in:
Bjørn Erik Pedersen 2018-04-19 17:40:54 +02:00
parent 3238e14fdf
commit d6982ac0ac
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
hugolib/page.go
View file

@ -1069,16 +1069,6 @@ func (p *Page) prepareForRender(cfg *BuildCfg) error {
// or a template or similar has changed so wee need to do a rerendering // or a template or similar has changed so wee need to do a rerendering
// of the shortcodes etc. // of the shortcodes etc.
// Handle bundled pages first, so the content is available in the
// owners' shortcodes.
for _, r := range p.Resources.ByType(pageResourceType) {
p.s.PathSpec.ProcessingStats.Incr(&p.s.PathSpec.ProcessingStats.Pages)
bp := r.(*Page)
if err := bp.prepareForRender(cfg); err != nil {
s.Log.ERROR.Printf("Failed to prepare bundled page %q for render: %s", bp.BaseFileName(), err)
}
}
// If in watch mode or if we have multiple output formats, // If in watch mode or if we have multiple output formats,
// we need to keep the original so we can // we need to keep the original so we can
// potentially repeat this process on rebuild. // potentially repeat this process on rebuild.
@ -1129,6 +1119,15 @@ func (p *Page) prepareForRender(cfg *BuildCfg) error {
//analyze for raw stats //analyze for raw stats
p.analyzePage() p.analyzePage()
// Handle bundled pages.
for _, r := range p.Resources.ByType(pageResourceType) {
p.s.PathSpec.ProcessingStats.Incr(&p.s.PathSpec.ProcessingStats.Pages)
bp := r.(*Page)
if err := bp.prepareForRender(cfg); err != nil {
s.Log.ERROR.Printf("Failed to prepare bundled page %q for render: %s", bp.BaseFileName(), err)
}
}
return nil return nil
} }