From 8e26d29887c4b0c08a82ec003d32404d56d67bbc Mon Sep 17 00:00:00 2001 From: Dwayne Litzenberger Date: Mon, 5 Mar 2012 19:46:01 -0500 Subject: Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not set. This should fix the following issue: "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)" https://github.com/rails/rails/issues/910 --- actionpack/lib/action_view/asset_paths.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb index 2a28e780bf..add8d94b70 100644 --- a/actionpack/lib/action_view/asset_paths.rb +++ b/actionpack/lib/action_view/asset_paths.rb @@ -117,7 +117,7 @@ module ActionView end def relative_url_root - config.relative_url_root + config.relative_url_root || current_request.try(:script_name) end def asset_host_config -- cgit v1.2.3