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

Fix mail_to

Browse source
This commit is contained in:
Ben Hollis 2012-12-30 15:55:46 -08:00
parent 3214cac153
commit a6c74b5231
1 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -133,39 +133,41 @@ module Middleman
uri = URI(url) uri = URI(url)
url_path = uri.path url_path = uri.path
path = Pathname(url_path) if url_path
url_path = current_source_dir.join(path).to_s if path.relative? path = Pathname(url_path)
url_path = current_source_dir.join(path).to_s if path.relative?
resource = sitemap.find_resource_by_path(url_path) resource = sitemap.find_resource_by_path(url_path)
# Allow people to turn on relative paths for all links with set :relative_links, true # Allow people to turn on relative paths for all links with config[:relative_links] = true
# but still override on a case by case basis with the :relative parameter. # but still override on a case by case basis with the :relative parameter.
effective_relative = relative || false effective_relative = relative || false
if relative.nil? && relative_links if relative.nil? && relative_links
effective_relative = true effective_relative = true
end
if resource
if effective_relative
resource_url = resource.url
# Output urls relative to the destination path, not the source path
current_dir = Pathname('/' + current_resource.destination_path).dirname
new_url = Pathname(resource_url).relative_path_from(current_dir).to_s
# Put back the trailing slash to avoid unnecessary Apache redirects
if resource_url.end_with?('/') && !new_url.end_with?('/')
new_url << '/'
end
else
new_url = resource.url
end end
uri.path = new_url if resource
if effective_relative
resource_url = resource.url
args[url_arg_index] = uri.to_s # Output urls relative to the destination path, not the source path
else current_dir = Pathname('/' + current_resource.destination_path).dirname
raise "No resource exists at #{url}" if relative new_url = Pathname(resource_url).relative_path_from(current_dir).to_s
# Put back the trailing slash to avoid unnecessary Apache redirects
if resource_url.end_with?('/') && !new_url.end_with?('/')
new_url << '/'
end
else
new_url = resource.url
end
uri.path = new_url
args[url_arg_index] = uri.to_s
else
raise "No resource exists at #{url}" if relative
end
end end
end end
end end