diff options
author | Jeroen van Dijk <jeroen@jeevidee.nl> | 2010-07-21 17:10:24 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-07-22 01:28:31 +0200 |
commit | ab62aa1c4309b670c5e3bdce2cf35113e1aa874b (patch) | |
tree | de33368af5a20b2d0895aa5593041c2612438df1 /actionmailer/lib/action_mailer | |
parent | 6f7402d32b7b867844fc4ffff891474dc348d0d1 (diff) | |
download | rails-ab62aa1c4309b670c5e3bdce2cf35113e1aa874b.tar.gz rails-ab62aa1c4309b670c5e3bdce2cf35113e1aa874b.tar.bz2 rails-ab62aa1c4309b670c5e3bdce2cf35113e1aa874b.zip |
Mention that ActionMailer::Base.default_url_options is now deprecated
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7f2ed5ba64..7bbde53306 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -125,14 +125,13 @@ module ActionMailer #:nodoc: # make sense to generate relative URLs in email messages. # # It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt> - # option in the <tt>ActionMailer::Base.default_url_options</tt> hash as follows: - # - # ActionMailer::Base.default_url_options[:host] = "example.com" - # - # This can also be set as a configuration option in <tt>config/application.rb</tt>: + # option as a configuration option in <tt>config/application.rb</tt>: # # config.action_mailer.default_url_options = { :host => "example.com" } # + # Setting <tt>ActionMailer::Base.default_url_options</tt> directly is now deprecated, use the configuration + # option mentioned above to set the default host. + # # If you do decide to set a default <tt>:host</tt> for your mailers you will want to use the # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. This will ensure that absolute URLs are # generated because the <tt>url_for</tt> view helper will, by default, generate relative URLs when a |