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

Merge pull request #1601 from maul-esel/fix-error-file 

Fix error file reporting
This commit is contained in:
Matt Rogers 2013-10-04 05:39:36 -07:00
parent 7d56426d50 76ada8c672
commit 2bb29216e7
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll/convertible.rb
View File

@ -84,13 +84,13 @@ module Jekyll
# info - the info for Liquid # info - the info for Liquid
# #
# Returns the converted content # Returns the converted content
def render_liquid(content, payload, info) 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}"
raise e raise e
rescue Exception => e rescue Exception => e
Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{self.path}" Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
raise e raise e
end end
@ -121,7 +121,8 @@ module Jekyll
self.output = self.render_liquid(layout.content, self.output = self.render_liquid(layout.content,
payload, payload,
info) info,
File.join(self.site.config['layouts'], layout.name))
if layout = layouts[layout.data["layout"]] if layout = layouts[layout.data["layout"]]
if used.include?(layout) if used.include?(layout)

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

@ -95,13 +95,11 @@ eos
context.stack do context.stack do
context['include'] = parse_params(context) if @params context['include'] = parse_params(context) if @params
begin
partial.render!(context) partial.render!(context)
end
rescue => e rescue => e
raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file) raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
end end
end
end
def validate_dir(dir, safe) def validate_dir(dir, safe)
if File.symlink?(dir) && safe if File.symlink?(dir) && safe