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

Document#post_read: only overwrite slug & ext if they aren't set by YAML

This commit is contained in:
Parker Moore 2016-01-22 09:36:55 -08:00
parent 6c40c7f553
commit 5878acaaf1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jekyll/document.rb
View File

@ -290,18 +290,19 @@ module Jekyll
def post_read def post_read
if relative_path =~ DATE_FILENAME_MATCHER if relative_path =~ DATE_FILENAME_MATCHER
_, date, slug, ext = $1, $2, $3, $4 date, slug, ext = $2, $3, $4
if !data['date'] || data['date'].to_i == site.time.to_i if !data['date'] || data['date'].to_i == site.time.to_i
merge_data!({"date" => date}, source: "filename") merge_data!({"date" => date}, source: "filename")
end end
elsif relative_path =~ DATELESS_FILENAME_MATCHER elsif relative_path =~ DATELESS_FILENAME_MATCHER
_, slug, ext = $1, $2, $3 slug, ext = $2, $3
end end
merge_data!({"slug" => slug, "ext" => ext}, source: "filename")
# Try to ensure the user gets a title. # Try to ensure the user gets a title.
data["title"] ||= Utils.titleize_slug(slug) data["title"] ||= Utils.titleize_slug(slug)
# Only overwrite slug & ext if they aren't specified.
data['slug'] ||= slug
data['ext'] ||= ext
populate_categories populate_categories
populate_tags populate_tags