diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-26 10:02:02 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-26 10:02:02 -0700 |
| commit | e97b6f2ef747f013f8d71d7d97dc88acc673ee6d (patch) | |
| tree | 502e36b963b957abfd3b7a2ccd3a1855afa8be18 /actionpack/lib/sprockets | |
| parent | cf90181d8409909803a8325f33e04b5dbdcd6ada (diff) | |
| parent | 1996e93eaa97993e176d2036be7b76d93709b141 (diff) | |
| download | rails-e97b6f2ef747f013f8d71d7d97dc88acc673ee6d.tar.gz rails-e97b6f2ef747f013f8d71d7d97dc88acc673ee6d.tar.bz2 rails-e97b6f2ef747f013f8d71d7d97dc88acc673ee6d.zip | |
Merge pull request #3138 from christos/correct_image_path_with_pipeline
Correctly override image_path in sprockets rails_helper
Diffstat (limited to 'actionpack/lib/sprockets')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index fe37553fc1..c8c6c3ddd9 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -60,9 +60,10 @@ module Sprockets options[:body] ? "#{path}?body=1" : path end - def path_to_image(source) - asset_paths.compute_public_path(source, asset_prefix) + def image_path(source) + asset_path(source) end + alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route private def debug_assets? |