From 8ad76e4370554b8479a79d2cf4b4f0b486c67b8f Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Fri, 16 Sep 2011 19:24:35 +0800 Subject: [PATCH] Replace Errbit::Application.config.action_mailer with ActionMailer::Base. This fixes misc. problems for both rake tasks and production servers. (smtp setttings were previously not being passed through in Rake tasks) --- config/initializers/_load_config.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/initializers/_load_config.rb b/config/initializers/_load_config.rb index 9ab6bca..4bd74d6 100644 --- a/config/initializers/_load_config.rb +++ b/config/initializers/_load_config.rb @@ -43,13 +43,12 @@ end # Set SMTP settings if given. if smtp = Errbit::Config.smtp_settings - Errbit::Application.config.action_mailer.smtp_settings = smtp ActionMailer::Base.delivery_method = :smtp ActionMailer::Base.smtp_settings = smtp end # Set config specific values -(Errbit::Application.config.action_mailer.default_url_options ||= {}).tap do |default| +(ActionMailer::Base.default_url_options ||= {}).tap do |default| default.merge! :host => Errbit::Config.host if default[:host].blank? end -- libgit2 0.21.2