diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-07-24 13:41:51 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-07-24 13:41:51 -0500 |
commit | a87462afcb6c642e59bfcd2e11e3351e2b718c38 (patch) | |
tree | d5826ee11982767558f23456487b67be5f035911 /actionpack/lib/action_view/helpers | |
parent | 3fd9036fc554979e951422a79f0f77f061112bdc (diff) | |
download | rails-a87462afcb6c642e59bfcd2e11e3351e2b718c38.tar.gz rails-a87462afcb6c642e59bfcd2e11e3351e2b718c38.tar.bz2 rails-a87462afcb6c642e59bfcd2e11e3351e2b718c38.zip |
AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 8d0ee81684..769eada120 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -476,7 +476,7 @@ module ActionView if has_request [ @controller.request.protocol, ActionController::Base.asset_host.to_s, - @controller.request.relative_url_root, + ActionController::Base.relative_url_root, dir, source, ext, include_host ].join else [ ActionController::Base.asset_host.to_s, @@ -492,8 +492,8 @@ module ActionView else source = "/#{dir}/#{source}" unless source[0] == ?/ if has_request - unless source =~ %r{^#{@controller.request.relative_url_root}/} - source = "#{@controller.request.relative_url_root}#{source}" + unless source =~ %r{^#{ActionController::Base.relative_url_root}/} + source = "#{ActionController::Base.relative_url_root}#{source}" end end |