github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-05 19:55:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

compute_public_path behaves well with mailers also. Closes #10014.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8052 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2007-10-29 04:01:58 +00:00
parent 204c2755e2
commit c240f2d48a
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
actionpack/lib/action_view/helpers/asset_tag_helper.rb
View File

@@ -387,10 +387,18 @@ module ActionView
# a single or wildcarded asset host, if configured, with the correct
# request protocol.
def compute_public_path(source, dir, ext = nil, include_host = true)
cache_key = [ @controller.request.protocol,
ActionController::Base.asset_host,
@controller.request.relative_url_root,
dir, source, ext, include_host ].join
has_request = @controller.respond_to?(:request)
cache_key =
if has_request
[ @controller.request.protocol,
ActionController::Base.asset_host,
@controller.request.relative_url_root,
dir, source, ext, include_host ].join
else
[ ActionController::Base.asset_host,
dir, source, ext, include_host ].join
end
ActionView::Base.computed_public_paths[cache_key] ||=
begin
@@ -400,13 +408,15 @@ module ActionView
source
else
source = "/#{dir}/#{source}" unless source[0] == ?/
source = "#{@controller.request.relative_url_root}#{source}"
if has_request
source = "#{@controller.request.relative_url_root}#{source}"
end
rewrite_asset_path!(source)
if include_host
host = compute_asset_host(source)
unless host.blank? or host =~ %r{^[-a-z]+://}
if has_request && !host.blank? && host !~ %r{^[-a-z]+://}
host = "#{@controller.request.protocol}#{host}"
end