dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1746 from maul-esel/missing-include 

output including file for include tag error
This commit is contained in:
Matt Rogers 2013-11-22 20:29:11 -08:00
parent 16f4d025ab c5533e9016
commit 7cb44fdff1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jekyll/convertible.rb
View File

@ -87,7 +87,7 @@ module Jekyll
def render_liquid(content, payload, info, path = nil) def render_liquid(content, payload, info, path = nil)
Liquid::Template.parse(content).render!(payload, info) Liquid::Template.parse(content).render!(payload, info)
rescue Tags::IncludeTagError => e rescue Tags::IncludeTagError => e
Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}" Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
raise e raise e
rescue Exception => e rescue Exception => e
Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}" Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"

14
lib/jekyll/tags/include.rb
View File

@ -96,14 +96,16 @@ eos
path = File.join(dir, file) path = File.join(dir, file)
validate_file(path, context.registers[:site].safe) validate_file(path, context.registers[:site].safe)
partial = Liquid::Template.parse(source(path, context)) begin
partial = Liquid::Template.parse(source(path, context))
context.stack do context.stack do
context['include'] = parse_params(context) if @params context['include'] = parse_params(context) if @params
partial.render!(context) partial.render!(context)
end
rescue => e
raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
end end
rescue => e
raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
end end
def validate_dir(dir, safe) def validate_dir(dir, safe)