mirror of
https://github.com/jekyll/jekyll.git
synced 2026-04-28 03:01:03 -04:00
check for the urldrop key first
This commit is contained in:
@@ -78,6 +78,11 @@ module Jekyll
|
||||
def y_day
|
||||
@obj.date.strftime("%j")
|
||||
end
|
||||
|
||||
private
|
||||
def fallback_data
|
||||
{}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -86,15 +86,14 @@ module Jekyll
|
||||
|
||||
def generate_url_from_drop(template)
|
||||
template.gsub(%r!:([a-z_]+)!) do |match|
|
||||
begin
|
||||
replacement = @placeholders.public_send(match.sub(":".freeze, "".freeze))
|
||||
rescue NoMethodError
|
||||
Jekyll.logger.warn "", "#{match} is not defined!"
|
||||
key = match.sub(":".freeze, "".freeze)
|
||||
unless @placeholders.key?(key)
|
||||
raise NoMethodError, "The URL template key #{key} doesn't exist!"
|
||||
end
|
||||
if replacement.nil?
|
||||
if @placeholders[key].nil?
|
||||
"".freeze
|
||||
else
|
||||
self.class.escape_path(replacement)
|
||||
self.class.escape_path(@placeholders[key])
|
||||
end
|
||||
end.gsub(%r!//!, "/".freeze)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user