diff options
| author | Chris Eppstein <chris@eppsteins.net> | 2011-06-27 13:54:54 -0700 |
|---|---|---|
| committer | Chris Eppstein <chris@eppsteins.net> | 2011-06-27 13:54:54 -0700 |
| commit | 6c64e1e3a33c2e703a9939f075fb57167b75b36a (patch) | |
| tree | 5a7f61d6ad2a700be76d84b241a3e763997911fd /actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb | |
| parent | 96137e8bd0a0094d26cc0cf6f86642487a60735f (diff) | |
| download | rails-6c64e1e3a33c2e703a9939f075fb57167b75b36a.tar.gz rails-6c64e1e3a33c2e703a9939f075fb57167b75b36a.tar.bz2 rails-6c64e1e3a33c2e703a9939f075fb57167b75b36a.zip | |
Stylesheet link tags should use the request protocol to avoid duplicate download of stylesheets in IE7 and IE8.
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
actionpack/lib/sprockets/helpers/rails_helper.rb
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb index 16d8f3f893..621f7aaa0a 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb @@ -60,8 +60,8 @@ module ActionView private - def path_to_asset(source) - asset_paths.compute_public_path(source, asset_name.to_s.pluralize, extension) + def path_to_asset(source, protocol = :relative) + asset_paths.compute_public_path(source, asset_name.to_s.pluralize, extension, true, protocol) end def path_to_asset_source(source) |