diff options
| author | Piotrek Okoński <piotrek@okonski.org> | 2011-12-12 16:52:56 +0100 |
|---|---|---|
| committer | Piotrek Okoński <piotrek@okonski.org> | 2011-12-12 17:11:07 +0100 |
| commit | 5266eb9f611a114663c48eec0680b7050181d3de (patch) | |
| tree | 43da85efd542743a07be3cd379071bae521a6679 /actionpack/lib | |
| parent | c0466603288252a5db8a4d8cf0ca193004a542ea (diff) | |
| download | rails-5266eb9f611a114663c48eec0680b7050181d3de.tar.gz rails-5266eb9f611a114663c48eec0680b7050181d3de.tar.bz2 rails-5266eb9f611a114663c48eec0680b7050181d3de.zip | |
Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/railtie.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb index c2a6809f58..dd5f9a1942 100644 --- a/actionpack/lib/abstract_controller/asset_paths.rb +++ b/actionpack/lib/abstract_controller/asset_paths.rb @@ -4,7 +4,7 @@ module AbstractController included do config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, - :stylesheets_dir, :default_asset_host_protocol + :stylesheets_dir, :default_asset_host_protocol, :relative_url_root end end end diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb index de7b837ecc..cb2e2b17aa 100644 --- a/actionpack/lib/action_controller/railtie.rb +++ b/actionpack/lib/action_controller/railtie.rb @@ -31,6 +31,7 @@ module ActionController # make sure readers methods get compiled options.asset_path ||= app.config.asset_path options.asset_host ||= app.config.asset_host + options.relative_url_root ||= app.config.relative_url_root ActiveSupport.on_load(:action_controller) do include app.routes.mounted_helpers |