deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #906 from adamesque/master

Browse source 
Make sure Frontmatter data is actually cached
This commit is contained in:
Thomas Reynolds 2013-05-23 13:35:01 -07:00
parent 90eb5fca3e c60cddc1ac
commit bcdaad6443
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
middleman-core/lib/middleman-core/core_extensions/front_matter.rb
View file

@ -59,14 +59,16 @@ module Middleman::CoreExtensions
@cache[p] ||= begin
file_data, content = frontmatter_and_content(p)
return [file_data, content] unless @app.files.exists?("#{path}.frontmatter")
if @app.files.exists?("#{path}.frontmatter")
external_data, _ = frontmatter_and_content("#{p}.frontmatter")
external_data, _ = frontmatter_and_content("#{p}.frontmatter")
[
external_data.deep_merge(file_data),
content
]
[
external_data.deep_merge(file_data),
content
]
else
[file_data, content]
end
end
end