aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-13 04:27:30 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-09-13 04:27:30 -0500
commitf509b6988b8902a83b9ae5c559d8860c87f2a4df (patch)
tree13ebdfa555867899a46705fa9f911cb97bcf35fa
parent536bb7b135285a434d67163df2bcd391558705de (diff)
downloadrails-f509b6988b8902a83b9ae5c559d8860c87f2a4df.tar.gz
rails-f509b6988b8902a83b9ae5c559d8860c87f2a4df.tar.bz2
rails-f509b6988b8902a83b9ae5c559d8860c87f2a4df.zip
Fix for relative url root in assets
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index f9135d43d2..5785da5124 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -17,7 +17,6 @@ module Sprockets
paths.asset_digests = asset_digests
paths.compile_assets = compile_assets?
paths.digest_assets = digest_assets?
- paths.relative_url_root = config.action_controller.relative_url_root
paths
end
end
@@ -97,8 +96,7 @@ module Sprockets
end
class AssetPaths < ::ActionView::AssetPaths #:nodoc:
- attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets,
- :digest_assets, :relative_url_root
+ attr_accessor :asset_environment, :asset_prefix, :asset_digests, :compile_assets, :digest_assets
class AssetNotPrecompiledError < StandardError; end
@@ -153,7 +151,7 @@ module Sprockets
end
def relative_url_root
- has_request? ? super : @relative_url_root
+ has_request? ? super : config.action_controller.relative_url_root
end
end
end