diff options
| author | Henning Koch <henning.koch@makandra.de> | 2010-11-19 18:16:54 +0100 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-19 15:38:13 -0200 |
| commit | deff5289474d966bb12ae18c1b816df3eeb11f27 (patch) | |
| tree | 59901c32e0a51d9956393f162b0cb399b0994e7f /actionpack/lib | |
| parent | cb8f7a1156933bfd12887142706b40be85eb05b2 (diff) | |
| download | rails-deff5289474d966bb12ae18c1b816df3eeb11f27.tar.gz rails-deff5289474d966bb12ae18c1b816df3eeb11f27.tar.bz2 rails-deff5289474d966bb12ae18c1b816df3eeb11f27.zip | |
Fix AssetIncludeTag ensuring that files are in the wrong directory [#6015 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb | 6 |
1 files changed, 3 insertions, 3 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 3bc81ae068..15f8e10b7f 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 @@ -57,8 +57,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, include_host = true) + asset_paths.compute_public_path(source, asset_name.to_s.pluralize, extension, include_host) end def compute_paths(*args) @@ -77,7 +77,7 @@ module ActionView def ensure_sources!(sources) sources.each do |source| - asset_file_path!(path_to_asset(source)) + asset_file_path!(path_to_asset(source, false)) end return sources end |