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

Fix c9d151ba66 for when files are outside the project

Browse source
This commit is contained in:
Ben Hollis 2013-05-22 23:39:56 -07:00
parent c9d151ba66
commit dbbf84016f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,15 +57,15 @@ module Middleman::CoreExtensions
def data(path)
p = normalize_path(path)
@cache[p] ||= begin
in_file = frontmatter_and_content(p)
file_data, content = frontmatter_and_content(p)
return in_file unless @app.files.exists?("#{path}.frontmatter")
return [file_data, content] unless @app.files.exists?("#{path}.frontmatter")
external_file = frontmatter_and_content("#{p}.frontmatter")
external_data, _ = frontmatter_and_content("#{p}.frontmatter")
[
external_file[0].deep_merge(in_file[0]),
in_file[1]
external_data.deep_merge(file_data),
content
]
end
end
@ -145,11 +145,11 @@ module Middleman::CoreExtensions
path
end
return nil unless @app.files.exists?(full_path)
data = {}
content = nil
return [data, content] unless @app.files.exists?(full_path)
if !::Middleman::Util.binary?(full_path)
content = File.read(full_path)