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

Merge pull request #4205 from jekyll/pull/fix-layout-vs-page-data 

Merge pull request 4205
This commit is contained in:
Parker Moore 2015-11-30 19:55:36 -08:00
parent d100a68563 ac9fa413a5
commit 4890cecaf3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jekyll/convertible.rb
View File

@ -210,7 +210,13 @@ module Jekyll
while layout while layout
Jekyll.logger.debug "Rendering Layout:", path Jekyll.logger.debug "Rendering Layout:", path
payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data}) payload = Utils.deep_merge_hashes(
payload,
{
"content" => output,
"layout" => layout.data
}
)
self.output = render_liquid(layout.content, self.output = render_liquid(layout.content,
payload, payload,