diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-12 09:14:48 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-12 09:14:48 -0800 |
| commit | af308ff3762c1923e9a5ecdbf2fb8f102062d675 (patch) | |
| tree | 43da85efd542743a07be3cd379071bae521a6679 /actionmailer/lib | |
| parent | c0466603288252a5db8a4d8cf0ca193004a542ea (diff) | |
| parent | 5266eb9f611a114663c48eec0680b7050181d3de (diff) | |
| download | rails-af308ff3762c1923e9a5ecdbf2fb8f102062d675.tar.gz rails-af308ff3762c1923e9a5ecdbf2fb8f102062d675.tar.bz2 rails-af308ff3762c1923e9a5ecdbf2fb8f102062d675.zip | |
Merge pull request #3946 from pokonski/relative_root
Fix #3365. Default config.relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"].
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/railtie.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb index 444754d0e9..5c03a29f0f 100644 --- a/actionmailer/lib/action_mailer/railtie.rb +++ b/actionmailer/lib/action_mailer/railtie.rb @@ -19,8 +19,9 @@ module ActionMailer options.stylesheets_dir ||= paths["public/stylesheets"].first # make sure readers methods get compiled - options.asset_path ||= app.config.asset_path - options.asset_host ||= app.config.asset_host + 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_mailer) do include AbstractController::UrlFor |