aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets/helpers
diff options
context:
space:
mode:
authordocunext <albert.lash@docunext.com>2011-09-21 13:19:48 -0400
committerdocunext <albert.lash@docunext.com>2011-09-22 13:43:08 -0400
commitc070cc4ab41fd848fc72f19e7f99d75b1e1fd097 (patch)
tree85bbb52783bc019b6aede112e69758b52a673cc8 /actionpack/lib/sprockets/helpers
parentcaa95ab6d826f4bb112c2911849ce03c7312af11 (diff)
downloadrails-c070cc4ab41fd848fc72f19e7f99d75b1e1fd097.tar.gz
rails-c070cc4ab41fd848fc72f19e7f99d75b1e1fd097.tar.bz2
rails-c070cc4ab41fd848fc72f19e7f99d75b1e1fd097.zip
Fixes #1489 again, with updated code and numerous tests to confirm
Diffstat (limited to 'actionpack/lib/sprockets/helpers')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 457ab93ae3..c569124c94 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -57,7 +57,7 @@ module Sprockets
def asset_path(source, options = {})
source = source.logical_path if source.respond_to?(:logical_path)
- path = asset_paths.compute_public_path(source, 'assets', options.merge(:body => true))
+ path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
options[:body] ? "#{path}?body=1" : path
end