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

Merge pull request #3089 from jekyll/remove-duplication-in-regexp

This commit is contained in:
Parker Moore 2014-11-12 18:46:44 -08:00
parent 3b40d964fb bd907c5be6
commit 314fb875b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/jekyll.rb
View File

@ -144,9 +144,9 @@ module Jekyll
return base_directory if base_directory.eql?(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 = clean_path.sub(/^\A\w\:\//, '/') clean_path = clean_path.sub(/\A\w\:\//, '/')
unless clean_path.start_with?(base_directory.sub(/^\A\w\:\//, '/')) 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