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

Add extra question to ensure that the index.html file is in thepagination path's directory

This commit is contained in:
Parker Moore 2013-05-05 17:26:29 +02:00
parent 2d0e65b5f7
commit 050e982006
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/jekyll/generators/pagination.rb
View File

@ -69,9 +69,19 @@ module Jekyll
# #
# Returns true if pagination is enabled, false otherwise. # Returns true if pagination is enabled, false otherwise.
def self.pagination_enabled?(config, page) def self.pagination_enabled?(config, page)
page.name == 'index.html' && !config['paginate'].nil? &&
!config['paginate'].nil? && page.name == 'index.html' &&
File.dirname(config['paginate_path']) == page.dir subdirectories_identical(config['paginate_path'], page.dir)
end
# Determine if the subdirectories of the two paths are the same relative to source
#
# paginate_path - the paginate_path configuration setting
# page_dir - the directory of the Jekyll::Page
#
# Returns whether the subdirectories are the same relative to source
def self.subdirectories_identical(paginate_path, page_dir)
File.dirname(paginate_path).gsub(/\A\./, '') == page_dir.gsub(/\/\z/, '')
end end
# Static: Return the pagination path of the page # Static: Return the pagination path of the page