diff options
| author | zhitomirskiyi <ilya@joindiaspora.com> | 2010-10-27 04:46:19 +0400 |
|---|---|---|
| committer | zhitomirskiyi <ilya@joindiaspora.com> | 2010-10-27 04:46:19 +0400 |
| commit | 0b2e00b7d6d6dd87a590100e3e19541f180b8fa1 (patch) | |
| tree | 4edb568d1ff1031ae20367a833117f1d5789757f /config/initializers/mailer_config.rb | |
| parent | fa484e95e450c3d33b659e7a8221cf3b36a322eb (diff) | |
MS IZ the mailer will not be setup unless turned on in the APP_CONFIG
Diffstat (limited to 'config/initializers/mailer_config.rb')
| -rw-r--r-- | config/initializers/mailer_config.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index cbc5f7330..b334cdb42 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -4,7 +4,7 @@ Diaspora::Application.configure do config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]} - unless Rails.env == 'test' + unless Rails.env == 'test' || APP_CONFIG[:mailer_on] != true config.action_mailer.delivery_method = :smtp config.action_mailer.smtp_settings = { :address => APP_CONFIG[:smtp_address], |