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

include: fix 'no implicit conversion of nil to String' 

This is when either 'dir' or 'file' is nil.
This commit is contained in:
Parker Moore 2017-01-10 12:12:55 -05:00
parent 47550935cb
commit faa67bcd62
No known key found for this signature in database
GPG Key ID: 193CDEBA72063C58
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,8 @@ eos
def locate_include_file(context, file, safe) def locate_include_file(context, file, safe)
includes_dirs = tag_includes_dirs(context) includes_dirs = tag_includes_dirs(context)
includes_dirs.each do |dir| includes_dirs.each do |dir|
path = File.join(dir, file) path = File.join(dir.to_s, file.to_s)
return path if valid_include_file?(path, dir, safe) return path if valid_include_file?(path, dir.to_s, safe)
end end
raise IOError, "Could not locate the included file '#{file}' in any of "\ raise IOError, "Could not locate the included file '#{file}' in any of "\
"#{includes_dirs}. Ensure it exists in one of those directories and, "\ "#{includes_dirs}. Ensure it exists in one of those directories and, "\
@ -163,7 +163,7 @@ eos
end end
def valid_include_file?(path, dir, safe) def valid_include_file?(path, dir, safe)
!(outside_site_source?(path, dir, safe) || !File.exist?(path)) !(outside_site_source?(path, dir, safe) || !File.file?(path))
end end
def outside_site_source?(path, dir, safe) def outside_site_source?(path, dir, safe)