aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-05-06 05:10:36 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-05-06 05:10:36 +0000
commitc971c248394c7d603d336e31457c51ca33edf67d (patch)
treebbe6a567f713ca659a7ac301d799d396a01e1caa /actionpack/lib/action_view/helpers
parent358a6693909009556f493f0c29e344af4acc3275 (diff)
downloadrails-c971c248394c7d603d336e31457c51ca33edf67d.tar.gz
rails-c971c248394c7d603d336e31457c51ca33edf67d.tar.bz2
rails-c971c248394c7d603d336e31457c51ca33edf67d.zip
Changed RAILS_ASSET_HOST to become ActionController::Base.asset_host
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1289 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 665674972d..ecaa12f542 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -110,7 +110,7 @@ module ActionView
source = "/#{dir}/#{source}" unless source.include?("/")
source = "#{source}.#{ext}" unless source.include?(".")
source = "#{@request.relative_url_root}#{source}"
- defined?(RAILS_ASSET_HOST) ? RAILS_ASSET_HOST + source : source
+ @controller.asset_host + source
end
end
end