github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-04-28 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only write collections.posts.permalink if permalink is set.

Browse Source
This commit is contained in:
Parker Moore
2016-04-04 11:49:24 -07:00
committed by Pat Hawks
parent c69ca4c11e
commit f2263a11b7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/jekyll/configuration.rb
View File

@@ -72,7 +72,7 @@ module Jekyll
'hard_wrap' => false,
'footnote_nr' => 1
}
}]
}].freeze
# Public: Turn all keys into string
#
@@ -271,14 +271,20 @@ module Jekyll
def add_default_collections
config = clone
# It defaults to `{}`, so this is only if someone sets it to null manually.
return config if config['collections'].nil?
# Ensure we have a hash.
if config['collections'].is_a?(Array)
config['collections'] = Hash[config['collections'].map { |c| [c, {}] }]
end
# Add posts.
config['collections']['posts'] ||= {}
config['collections']['posts']['output'] = true
config['collections']['posts']['permalink'] = style_to_permalink(config['permalink'])
if config['permalink']
config['collections']['posts']['permalink'] ||= style_to_permalink(config['permalink'])
end
config
end