aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/asset_tag_helper.rb10
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