Commit 8ad76e4370554b8479a79d2cf4b4f0b486c67b8f
1 parent
de64c68d
Exists in
master
and in
1 other branch
Replace Errbit::Application.config.action_mailer with ActionMailer::Base. This f…
…ixes misc. problems for both rake tasks and production servers. (smtp setttings were previously not being passed through in Rake tasks)
Showing
1 changed file
with
1 additions
and
2 deletions
Show diff stats
config/initializers/_load_config.rb
... | ... | @@ -43,13 +43,12 @@ end |
43 | 43 | |
44 | 44 | # Set SMTP settings if given. |
45 | 45 | if smtp = Errbit::Config.smtp_settings |
46 | - Errbit::Application.config.action_mailer.smtp_settings = smtp | |
47 | 46 | ActionMailer::Base.delivery_method = :smtp |
48 | 47 | ActionMailer::Base.smtp_settings = smtp |
49 | 48 | end |
50 | 49 | |
51 | 50 | # Set config specific values |
52 | -(Errbit::Application.config.action_mailer.default_url_options ||= {}).tap do |default| | |
51 | +(ActionMailer::Base.default_url_options ||= {}).tap do |default| | |
53 | 52 | default.merge! :host => Errbit::Config.host if default[:host].blank? |
54 | 53 | end |
55 | 54 | ... | ... |