From d27408d8a93c63e0e5d6b590434f4dbd1d447e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 7 Sep 2012 21:46:13 +0200
Subject: [PATCH] set perform_deliveries, this should fix #3524

---
 config/initializers/mailer_config.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index cde7ecd04..b8b818c5d 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -7,6 +7,7 @@ Diaspora::Application.configure do
   config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme,
                                               :host => AppConfig[:pod_uri].authority }
   config.action_mailer.asset_host = AppConfig[:pod_uri].to_s
+  config.action_mailer.perform_deliveries = AppConfig[:mailer_on]
 
   unless Rails.env == 'test' || AppConfig[:mailer_on] != true
     if AppConfig[:mailer_method] == 'messagebus'