diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 137d5894..ce94b64b 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -141,9 +141,12 @@ module Jekyll # # Returns the sanitized 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.gsub!(/\A\w\:\//, '/') - unless clean_path.start_with?(base_directory) + clean_path = clean_path.sub(/^\A\w\:\//, '/') + + unless clean_path.start_with?(base_directory.sub(/^\A\w\:\//, '/')) File.join(base_directory, clean_path) else clean_path