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

Strip the drive name from both paths when checking the prefix.

This commit is contained in:
Parker Moore 2014-11-08 13:10:28 -08:00
parent 4df73ced0d
commit 067f8b6be7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll.rb
View File

@ -141,9 +141,12 @@ module Jekyll
# #
# Returns the sanitized path. # Returns the sanitized path.
def sanitized_path(base_directory, questionable_path) def sanitized_path(base_directory, questionable_path)
return base_directory if base_directory.eql?(questionable_path)
clean_path = File.expand_path(questionable_path, "/") clean_path = File.expand_path(questionable_path, "/")
clean_path.gsub!(/\A\w\:\//, '/') clean_path = clean_path.sub(/^\A\w\:\//, '/')
unless clean_path.start_with?(base_directory)
unless clean_path.start_with?(base_directory.sub(/^\A\w\:\//, '/'))
File.join(base_directory, clean_path) File.join(base_directory, clean_path)
else else
clean_path clean_path