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

Merge pull request #2731 from jekyll/doc-to_s

This commit is contained in:
Parker Moore 2014-08-12 13:47:32 -04:00
parent 5367bc3416 db34c48927
commit ba63a2c6d1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/document.rb
View File

@ -246,7 +246,7 @@ module Jekyll
# #
# Returns the content of the document # Returns the content of the document
def to_s def to_s
output || content content || ''
end end
# Compare this document against another document. # Compare this document against another document.

7
lib/jekyll/renderer.rb
View File

@ -49,14 +49,17 @@ module Jekyll
output = render_liquid(output, payload, info) output = render_liquid(output, payload, info)
end end
output = convert(output)
document.content = output
if document.place_in_layout? if document.place_in_layout?
place_in_layouts( place_in_layouts(
convert(output), output,
payload, payload,
info info
) )
else else
convert(output) output
end end
end end