Remove paginate check (#6606)

Merge pull request 6606
This commit is contained in:
jekyllbot
2017-12-10 08:35:12 -05:00
committed by GitHub
parent 1691685c77
commit ba75c87f63
2 changed files with 6 additions and 34 deletions

View File

@@ -97,7 +97,7 @@ module Jekyll
# problems and backwards-compatibility.
def from(user_config)
Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
.fix_common_issues.add_default_collections
.add_default_collections
end
end
@@ -210,7 +210,7 @@ module Jekyll
warn err
end
configuration.fix_common_issues.backwards_compatibilize.add_default_collections
configuration.backwards_compatibilize.add_default_collections
end
# Public: Split a CSV string into an array containing its values
@@ -246,18 +246,9 @@ module Jekyll
config
end
# DEPRECATED.
def fix_common_issues
config = clone
if config.key?("paginate") && (!config["paginate"].is_a?(Integer) ||
config["paginate"] < 1)
Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a positive" \
" integer or nil. It's currently set to '#{config["paginate"].inspect}'."
config["paginate"] = nil
end
config
self
end
def add_default_collections