Convertible: set self.output in #render_all_layouts and #do_layout #5337

Merged
merged 1 commit into from Sep 8, 2016

Projects

None yet

5 participants

@parkr
Member
parkr commented Sep 7, 2016 edited

In #5308, I modified Convertible to essentially delegate to the Renderer. This removed a lot of duplicated code (😸) but introduced a slight difference: the Renderer doesn't really modify the document it's rendering–it's meant only to render and return the result. Sadly, then, the methods aren't entirely equivalent. This PR sets self.output in two places to ensure the old functionality is preserved.

Without this, the jekyll-sitemap gem barfed when rendering the source of jekyllrb.com. It uses the Page API's rather than the Renderer. Without these changes the site_map.output value is nil on the latest jekyll/jekyll master.

/cc @jekyll/stability

@parkr parkr Convertible: set self.output in #render_all_layouts and #do_layout
3840a38
@parkr parkr added the fix label Sep 7, 2016
@parkr parkr assigned pathawks and unassigned parkr Sep 7, 2016
@parkr parkr referenced this pull request Sep 7, 2016
Closed

Jekyll HEAD has a breaking change that breaks some plugins. #5328

6 of 10 tasks complete
@parkr
Member
parkr commented Sep 7, 2016
@parkr
Member
parkr commented Sep 8, 2016

@envygeeks would you mind taking a 👀 ?

@envygeeks
Member

This is LGTM!

@parkr
Member
parkr commented Sep 8, 2016

Thanks. :) LGTM.

@parkr
Member
parkr commented Sep 8, 2016

@jekyllbot: merge +bug

@jekyllbot jekyllbot merged commit a70abbe into master Sep 8, 2016

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
jekyll/lgtm Approved by @envygeeks and @parkr.
@jekyllbot jekyllbot added bug fix labels Sep 8, 2016
@jekyllbot jekyllbot deleted the fix-convertible-5308 branch Sep 8, 2016
@pathawks
Member
pathawks commented Sep 8, 2016

🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment