parent
f221b925b4
commit
2c9a349f9a
|
@ -50,7 +50,8 @@ module Jekyll
|
||||||
urls = {}
|
urls = {}
|
||||||
urls = collect_urls(urls, site.pages, site.dest)
|
urls = collect_urls(urls, site.pages, site.dest)
|
||||||
urls = collect_urls(urls, site.posts.docs, site.dest)
|
urls = collect_urls(urls, site.posts.docs, site.dest)
|
||||||
urls.select { |_, p| p.size > 1 }.each do |url, paths|
|
urls.each do |url, paths|
|
||||||
|
next unless paths.size > 1
|
||||||
conflicting_urls = true
|
conflicting_urls = true
|
||||||
Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \
|
Jekyll.logger.warn "Conflict:", "The URL '#{url}' is the destination" \
|
||||||
" for the following pages: #{paths.join(", ")}"
|
" for the following pages: #{paths.join(", ")}"
|
||||||
|
@ -77,7 +78,8 @@ module Jekyll
|
||||||
def urls_only_differ_by_case(site)
|
def urls_only_differ_by_case(site)
|
||||||
urls_only_differ_by_case = false
|
urls_only_differ_by_case = false
|
||||||
urls = case_insensitive_urls(site.pages + site.docs_to_write, site.dest)
|
urls = case_insensitive_urls(site.pages + site.docs_to_write, site.dest)
|
||||||
urls.select { |_, p| p.size > 1 }.each do |_, real_urls|
|
urls.each do |case_insensitive_url, real_urls|
|
||||||
|
next unless real_urls.uniq.size > 1
|
||||||
urls_only_differ_by_case = true
|
urls_only_differ_by_case = true
|
||||||
Jekyll.logger.warn "Warning:", "The following URLs only differ" \
|
Jekyll.logger.warn "Warning:", "The following URLs only differ" \
|
||||||
" by case. On a case-insensitive file system one of the URLs" \
|
" by case. On a case-insensitive file system one of the URLs" \
|
||||||
|
|
|
@ -59,21 +59,21 @@ eos
|
||||||
def render(context)
|
def render(context)
|
||||||
site = context.registers[:site]
|
site = context.registers[:site]
|
||||||
|
|
||||||
post = site.posts.docs.find { |p| @post == p }
|
site.posts.docs.each do |p|
|
||||||
if post
|
return p.url if @post == p
|
||||||
return post.url
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# New matching method did not match, fall back to old method
|
# New matching method did not match, fall back to old method
|
||||||
# with deprecation warning if this matches
|
# with deprecation warning if this matches
|
||||||
|
|
||||||
post = site.posts.docs.find { |p| @post.deprecated_equality p }
|
|
||||||
if post
|
site.posts.docs.each do |p|
|
||||||
|
next unless @post.deprecated_equality p
|
||||||
Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \
|
Jekyll::Deprecator.deprecation_message "A call to '{{ post_url #{@post.name} }}' did not match " \
|
||||||
"a post using the new matching method of checking name " \
|
"a post using the new matching method of checking name " \
|
||||||
"(path-date-slug) equality. Please make sure that you " \
|
"(path-date-slug) equality. Please make sure that you " \
|
||||||
"change this tag to match the post's name exactly."
|
"change this tag to match the post's name exactly."
|
||||||
return post.url
|
return p.url
|
||||||
end
|
end
|
||||||
|
|
||||||
raise ArgumentError.new <<-eos
|
raise ArgumentError.new <<-eos
|
||||||
|
|
Loading…
Reference in New Issue