diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-21 12:41:05 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-21 12:41:05 -0800 |
| commit | 03d8aa8dc3b6c31dde4b543d84e2e84dd24a8802 (patch) | |
| tree | 4de85954854c13d86128c680c9410854ac50f29a /actionpack | |
| parent | f667f0f7ee63a14e600abb0a32446193794c28f1 (diff) | |
| parent | 445f14e97553de552745de26ebd5e49bc5c82f4e (diff) | |
| download | rails-03d8aa8dc3b6c31dde4b543d84e2e84dd24a8802.tar.gz rails-03d8aa8dc3b6c31dde4b543d84e2e84dd24a8802.tar.bz2 rails-03d8aa8dc3b6c31dde4b543d84e2e84dd24a8802.zip | |
Merge pull request #9021 from drogus/fix-asset-path
Fix asset_path in mounted engine
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_url_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_url_helper.rb b/actionpack/lib/action_view/helpers/asset_url_helper.rb index 0affac41e8..71b78cf0b5 100644 --- a/actionpack/lib/action_view/helpers/asset_url_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_url_helper.rb @@ -132,8 +132,7 @@ module ActionView source = compute_asset_path(source, options) end - relative_url_root = (defined?(config.relative_url_root) && config.relative_url_root) || - (respond_to?(:request) && request.try(:script_name)) + 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}/") end |