lib/jekyll/page.rb in jekyll-0.2.1 vs lib/jekyll/page.rb in jekyll-0.3.0

@@ -35,12 +35,12 @@
     # Add any necessary layouts to this post
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
     #
     # Returns nothing
-    def add_layout(layouts, site_payload)
-      payload = {"page" => self.data}
-      do_layout(payload, layouts, site_payload)
+    def render(layouts, site_payload)
+      payload = {"page" => self.data}.deep_merge(site_payload)
+      do_layout(payload, layouts)
     end
     
     # Write the generated page file to the destination directory.
     #   +dest+ is the String path to the destination dir
     #
\ No newline at end of file