diff options
| author | phoet <phoetmail@googlemail.com> | 2014-05-01 15:10:56 -0400 |
|---|---|---|
| committer | phoet <phoetmail@googlemail.com> | 2014-05-01 16:09:17 -0400 |
| commit | b6aa70c3b50574832fc4646f083c50a30df1d6b4 (patch) | |
| tree | eaabc5ae14594841d8f907659563e636af240f8e /actionview/lib/action_view | |
| parent | 0b6ac002f9afa5952c1b03aea4284e61d6239938 (diff) | |
| download | rails-b6aa70c3b50574832fc4646f083c50a30df1d6b4.tar.gz rails-b6aa70c3b50574832fc4646f083c50a30df1d6b4.tar.bz2 rails-b6aa70c3b50574832fc4646f083c50a30df1d6b4.zip | |
always use File.join
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_url_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb index c830ab23e3..41997a85b3 100644 --- a/actionview/lib/action_view/helpers/asset_url_helper.rb +++ b/actionview/lib/action_view/helpers/asset_url_helper.rb @@ -134,11 +134,11 @@ module ActionView relative_url_root = defined?(config.relative_url_root) && config.relative_url_root if relative_url_root - source = "#{relative_url_root}#{source}" unless source.starts_with?("#{relative_url_root}/") + source = File.join(relative_url_root, source) unless source.starts_with?("#{relative_url_root}/") end if host = compute_asset_host(source, options) - source = "#{host}#{source}" + source = File.join(host, source) end "#{source}#{tail}" |