diff options
author | Carlhuda <carlhuda@engineyard.com> | 2010-03-02 17:20:13 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-03 15:49:52 -0800 |
commit | bcfb77782b9d7f28f0c19005da909162e5e27690 (patch) | |
tree | 136ab5091182ae2b927d31f9a5453b050d647925 /actionpack/lib/action_view/helpers | |
parent | 664090348154ccbf1274a13bbc3d3c37ba35bc7d (diff) | |
download | rails-bcfb77782b9d7f28f0c19005da909162e5e27690.tar.gz rails-bcfb77782b9d7f28f0c19005da909162e5e27690.tar.bz2 rails-bcfb77782b9d7f28f0c19005da909162e5e27690.zip |
Work on deprecating ActionController::Base.relative_url_root
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 96976ce45f..5f76ff456e 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -648,8 +648,8 @@ module ActionView source = rewrite_asset_path(source) if has_request && include_host - unless source =~ %r{^#{ActionController::Base.relative_url_root}/} - source = "#{ActionController::Base.relative_url_root}#{source}" + unless source =~ %r{^#{controller.config.relative_url_root}/} + source = "#{controller.config.relative_url_root}#{source}" end end end |