Put ActionMailer configuration in the right place.

[rails.git] / config / initializers / action_mailer.rb

diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb
index 98b599ce9577c327b02eeb4391c23b5868bb643d..2ccc71ff42a3c5bef8848ec70d75be426ba9bf75 100644 (file)
--- a/config/initializers/action_mailer.rb
+++ b/config/initializers/action_mailer.rb
@@ -1,10 +1,13 @@
-# Configure ActionMailer
+# Configure ActionMailer SMTP settings
 ActionMailer::Base.smtp_settings = {
   :address => 'localhost',
   :port => 25, 
   :domain => 'localhost',
 }
 
+# This will let you more easily use helpers based on url_for in your mailers.
+ActionMailer::Base.default_url_options[:host] = APP_CONFIG['host']
+
 # Monkey patch to fix return-path bug in ActionMailer 2.2.2
 # Can be removed once we go to 2.3
 module Net