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

Merge pull request 4205
2015-11-30 19:55:36 -08:00 · 2015-11-30 19:55:36 -08:00 · 4890cecaf3
parent d100a68563 ac9fa413a5
commit 4890cecaf3
1 changed files with 7 additions and 1 deletions
--- a/lib/jekyll/convertible.rb
+++ b/lib/jekyll/convertible.rb
@ -210,7 +210,13 @@ module Jekyll

      while layout
        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,
                                         payload,