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

Merge pull request #3580 from jekyll/fix-3393 

Merge pull request 3580
This commit is contained in:
Parker Moore 2015-03-17 16:28:04 -07:00
parent 6d20525dce eb2fc89776
commit 333b9f5f93
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/jekyll/configuration.rb
View File

@ -262,11 +262,6 @@ module Jekyll
"be removed in 3.0.0. We recommend you switch to Kramdown." "be removed in 3.0.0. We recommend you switch to Kramdown."
end end
if config.key?('paginate') && config['paginate'] && !(config['gems'] || []).include?('jekyll-paginate')
Jekyll::Deprecator.deprecation_message "You appear to have pagination " +
"turned on, but you haven't included the `jekyll-paginate` gem. " +
"Ensure you have `gems: [jekyll-paginate]` in your configuration file."
end
config config
end end

10
lib/jekyll/plugin_manager.rb
View File

@ -17,6 +17,7 @@ module Jekyll
def conscientious_require def conscientious_require
require_plugin_files require_plugin_files
require_gems require_gems
deprecation_checks
end end
# Require each of the gem plugins specified. # Require each of the gem plugins specified.
@ -88,5 +89,14 @@ module Jekyll
end end
end end
def deprecation_checks
pagination_included = (site.config['gems'] || []).include?('jekyll-paginate') || defined?(Jekyll::Paginate)
if site.config['paginate'] && !pagination_included
Jekyll::Deprecator.deprecation_message "You appear to have pagination " +
"turned on, but you haven't included the `jekyll-paginate` gem. " +
"Ensure you have `gems: [jekyll-paginate]` in your configuration file."
end
end
end end
end end