Merge commit '24664e4bbab4d1805b8c23509798e4305032ebe5'

features/nested_layouts.feature

@@ -6,4 +6,14 @@ Feature: Allow nesting of layouts
     Then I should see "Template"
     And I should see "Inner"
     And I should see "Outer"
-    And I should see "Master"
+    And I should see "Master"
+
+  Scenario: YAML Front Matter isn't clobbered with nested layouts
+    Given the Server is running at "nested-layout-app"
+    When I go to "/data-one.html"
+    Then I should see "Page Number One"
+    When I go to "/data-two.html"
+    Then I should see "Page Number Two"
+    When I go to "/data-one.html"
+    Then I should see "Page Number One"
+    When I go to "/data-two.html"

fixtures/nested-layout-app/source/data-one.html.erb

@@ -0,0 +1,5 @@
+---
+title: Page Number One
+layout: outer
+---
+Page #1

fixtures/nested-layout-app/source/data-two.html.erb

@@ -0,0 +1,5 @@
+---
+title: Page Number Two
+layout: outer
+---
+Page #2

fixtures/nested-layout-app/source/layouts/master.erb

@@ -1,2 +1,3 @@
 Master
+<%= data.page.title %>
 <%= yield %>

lib/middleman/extensions/sitemap_tree.rb

@@ -16,7 +16,7 @@ module Middleman::Extensions
         if !@sitemap_tree_cache.has_key?(key)
           auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
 
-          app.sitemap.all_paths.each do |path|
+          sitemap.all_paths.each do |path|
             next if !regex.nil? && !path.match(regex)
             sub = auto_hash
             path.split( "/" ).each{ |dir| sub[dir]; sub = sub[dir] }