dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5337 from jekyll/fix-convertible-5308 

Merge pull request 5337
This commit is contained in:
jekyllbot 2016-09-08 11:27:35 -07:00 committed by GitHub
parent 6ebdcdb198 3840a38081
commit a70abbeab5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll/convertible.rb
View File

@ -193,7 +193,7 @@ module Jekyll
# Returns nothing # Returns nothing
def render_all_layouts(layouts, payload, info) def render_all_layouts(layouts, payload, info)
_renderer.layouts = layouts _renderer.layouts = layouts
_renderer.place_in_layouts(output, payload, info) self.output = _renderer.place_in_layouts(output, payload, info)
ensure ensure
@_renderer = nil # this will allow the modifications above to disappear @_renderer = nil # this will allow the modifications above to disappear
end end
@ -205,11 +205,10 @@ module Jekyll
# #
# Returns nothing. # Returns nothing.
def do_layout(payload, layouts) def do_layout(payload, layouts)
_renderer.tap do |renderer| self.output = _renderer.tap do |renderer|
renderer.layouts = layouts renderer.layouts = layouts
renderer.payload = payload renderer.payload = payload
renderer.run end.run
end
Jekyll.logger.debug "Post-Render Hooks:", self.relative_path Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
Jekyll::Hooks.trigger hook_owner, :post_render, self Jekyll::Hooks.trigger hook_owner, :post_render, self