aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorPiotrek Okoński <piotrek@okonski.org>2011-12-12 16:52:56 +0100
committerPiotrek Okoński <piotrek@okonski.org>2011-12-12 17:11:07 +0100
commit5266eb9f611a114663c48eec0680b7050181d3de (patch)
tree43da85efd542743a07be3cd379071bae521a6679 /actionmailer/lib
parentc0466603288252a5db8a4d8cf0ca193004a542ea (diff)
downloadrails-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 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/railtie.rb5
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