diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-13 00:27:29 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-13 00:27:29 -0700 |
| commit | 5bad79d93011faae839a57edaa20195398ab5764 (patch) | |
| tree | 476068818e2f22bf335fb5354068c8f0d450126b /actionpack/lib/sprockets/helpers | |
| parent | f1c3903f5c5ad7014355d92fb8572e324aac5296 (diff) | |
| download | rails-5bad79d93011faae839a57edaa20195398ab5764.tar.gz rails-5bad79d93011faae839a57edaa20195398ab5764.tar.bz2 rails-5bad79d93011faae839a57edaa20195398ab5764.zip | |
always rewrite_relative_url_root
Diffstat (limited to 'actionpack/lib/sprockets/helpers')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 7d9296fa90..f9135d43d2 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -103,11 +103,7 @@ module Sprockets class AssetNotPrecompiledError < StandardError; end def compute_public_path(source, dir, ext = nil, include_host = true, protocol = nil) - public_path = super(source, asset_prefix, ext, include_host, protocol) - if !is_uri?(public_path) && relative_url_root - public_path = rewrite_relative_url_root(public_path, relative_url_root) - end - public_path + super(source, asset_prefix, ext, include_host, protocol) end # Return the filesystem path for the source |