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

Merge branch 'master' of https://github.com/wbrady/jekyll into wbrady-master

This commit is contained in:
Tom Preston-Werner 2012-12-15 16:35:45 -08:00
parent 0b62b37122 336ea66983
commit 26f8d60542
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/jekyll/convertible.rb
View File

@ -76,9 +76,13 @@ module Jekyll
payload["pygments_suffix"] = converter.pygments_suffix payload["pygments_suffix"] = converter.pygments_suffix
begin begin
self.content = Liquid::Template.parse(self.content).render(payload, info) self.content = Liquid::Template.parse(self.content).render!(payload, info)
rescue => e rescue => e
puts "Liquid Exception: #{e.message} in #{self.name}" puts "Liquid Exception: #{e.message} in #{self.name}"
e.backtrace.each do |backtrace|
puts backtrace
end
abort("Build Failed")
end end
self.transform self.transform
@ -94,9 +98,13 @@ module Jekyll
payload = payload.deep_merge({"content" => self.output, "page" => layout.data}) payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
begin begin
self.output = Liquid::Template.parse(layout.content).render(payload, info) self.output = Liquid::Template.parse(layout.content).render!(payload, info)
rescue => e rescue => e
puts "Liquid Exception: #{e.message} in #{self.data["layout"]}" puts "Liquid Exception: #{e.message} in #{self.data["layout"]}"
e.backtrace.each do |backtrace|
puts backtrace
end
abort("Build Failed")
end end
if layout = layouts[layout.data["layout"]] if layout = layouts[layout.data["layout"]]