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

restrict rescue-clause in IncludeTag#render 

As it previously enclosed the whole method, it also
wrapped file validation errors, which is not meant to be.

Fixes #1745.
This commit is contained in:
maul.esel 2013-11-22 06:58:52 +01:00
parent 3888a24068
commit c5533e9016
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)