Skip to content

Fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52870c0
Fix endless recursion and make sure we stay in site.dest
csware Jul 3, 2016
5b3dc16
Make sure we stay in the site folder
csware Jul 3, 2016
5e02e20
jekyll-multisite requires jekyll-paginate
csware Jul 12, 2016
a822ff4
Make work on *nix and Windows
csware Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jekyll-multisite.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ Gem::Specification.new do |s|
s.license = 'GPL-3.0'
s.files = ['lib/jekyll-multisite.rb']
s.add_runtime_dependency 'jekyll', '~> 3.0', '>= 3.0.1'
s.add_runtime_dependency 'jekyll-paginate', '~> 1.1.0'
end
6 changes: 4 additions & 2 deletions lib/jekyll-multisite.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ def sanitized_path(base_directory, questionable_path)
base_directory
elsif questionable_path.start_with?(base_directory)
questionable_path
elsif File.exists?(questionable_path) and questionable_path != '/'
elsif File.exists?(questionable_path) and !questionable_path.start_with?('/') and (ENV['OS'] == 'Windows_NT')
File.expand_path(questionable_path)
elsif File.exists?(questionable_path) and questionable_path != '/' and !(ENV['OS'] == 'Windows_NT')
File.expand_path(questionable_path)
else
File.join(base_directory, questionable_path)
Expand All @@ -46,7 +48,7 @@ def sanitized_path(base_directory, questionable_path)
class Cleaner
def parent_dirs(file)
parent_dir = File.dirname(file)
if parent_dir == '/'
if parent_dir == '/' or File.dirname(parent_dir) == parent_dir or !parent_dir.start_with?(site.dest)
[]
elsif parent_dir == site.dest
[]
Expand Down