diff options
| author | Dwayne Litzenberger <dlitz@patientway.com> | 2012-03-05 19:46:01 -0500 |
|---|---|---|
| committer | Dwayne Litzenberger <dlitz@patientway.com> | 2012-03-05 19:46:01 -0500 |
| commit | 8e26d29887c4b0c08a82ec003d32404d56d67bbc (patch) | |
| tree | 508ed60db8a1af1bd522e32f49044be1fd45ad8e /actionpack/lib | |
| parent | dc8071520761d954d0958316a45aa9223b70a3d1 (diff) | |
| download | rails-8e26d29887c4b0c08a82ec003d32404d56d67bbc.tar.gz rails-8e26d29887c4b0c08a82ec003d32404d56d67bbc.tar.bz2 rails-8e26d29887c4b0c08a82ec003d32404d56d67bbc.zip | |
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
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/asset_paths.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |