deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge stable

Browse source
This commit is contained in:
Thomas Reynolds 2015-04-26 11:32:47 -07:00
commit 2403fa2d81
17 changed files with 184 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/util.rb
View file

@ -283,7 +283,7 @@ module Middleman
if path_or_resource.is_a?(::Middleman::Sitemap::Resource)
resource = path_or_resource
resource_url = url
elsif this_resource && uri.path
elsif this_resource && uri.path && !uri.host
# Handle relative urls
url_path = Pathname(uri.path)
current_source_dir = Pathname('/' + this_resource.path).dirname
@ -299,7 +299,7 @@ module Middleman
resource = app.sitemap.find_resource_by_destination_path(url_path.to_s)
resource_url = resource.url if resource
end
elsif options[:find_resource] && uri.path
elsif options[:find_resource] && uri.path && !uri.host
resource = app.sitemap.find_resource_by_path(uri.path)
resource_url = resource.url if resource
end