From 73e79f0049b642dd1246aebdf7e4696682ec56c2 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 30 Aug 2016 14:14:22 -0700 Subject: [PATCH] Proxy Convertible#converters to Renderer#run --- lib/jekyll/convertible.rb | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/lib/jekyll/convertible.rb b/lib/jekyll/convertible.rb index c0c97e33..9922f779 100644 --- a/lib/jekyll/convertible.rb +++ b/lib/jekyll/convertible.rb @@ -200,30 +200,9 @@ module Jekyll # # Returns nothing. def do_layout(payload, layouts) - Jekyll.logger.debug "Rendering:", self.relative_path + @_renderer = Jekyll::Renderer.new(site, self, payload) + _renderer.run - Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path - Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload - info = { - :filters => [Jekyll::Filters], - :registers => { :site => site, :page => payload["page"] } - } - - # render and transform content (this becomes the final content of the object) - payload["highlighter_prefix"] = converters.first.highlighter_prefix - payload["highlighter_suffix"] = converters.first.highlighter_suffix - - if render_with_liquid? - Jekyll.logger.debug "Rendering Liquid:", self.relative_path - self.content = render_liquid(content, payload, info, path) - end - Jekyll.logger.debug "Rendering Markup:", self.relative_path - self.content = transform - - # output keeps track of what will finally be written - self.output = content - - render_all_layouts(layouts, payload, info) if place_in_layout? Jekyll.logger.debug "Post-Render Hooks:", self.relative_path Jekyll::Hooks.trigger hook_owner, :post_render, self end