diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2009-01-01 18:12:49 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-01-01 18:12:49 +0100 |
commit | 49a055dff639164435dfb71bf18d695970eedac9 (patch) | |
tree | 3c20c4efad47cad949d6d2ef5c236bdd502bf1dc /actionpack/lib | |
parent | 3b92b141fd0759476690a174d5e2f8f0f2d9f1b7 (diff) | |
download | rails-49a055dff639164435dfb71bf18d695970eedac9.tar.gz rails-49a055dff639164435dfb71bf18d695970eedac9.tar.bz2 rails-49a055dff639164435dfb71bf18d695970eedac9.zip |
Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string [#1299 state:committed]
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index 0633d5414e..79b1cdbc48 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -545,12 +545,12 @@ module ActionView @source = source @include_host = include_host @cache_key = if controller.respond_to?(:request) - [self.class.name,controller.request.protocol, - ActionController::Base.asset_host, - ActionController::Base.relative_url_root, - source, include_host] + [ self.class.name,controller.request.protocol, + compute_asset_host(source), + ActionController::Base.relative_url_root, + source, include_host ] else - [self.class.name,ActionController::Base.asset_host, source, include_host] + [ self.class.name, compute_asset_host(source), source, include_host ] end end |