From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 31 Jul 2012 18:09:33 +0000 (+0000)
Subject: Fixed that Mailer.with_synched_deliveries does not use delivery settings (#11550).
X-Git-Tag: 2.1.0~179
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c57a2974d16e7ce9706f0bc7aab279c53b4895fc;p=redmine.git

Fixed that Mailer.with_synched_deliveries does not use delivery settings (#11550).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10147 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ca988cdd8..1f9a04af4 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -361,7 +361,9 @@ class Mailer < ActionMailer::Base
   def self.with_synched_deliveries(&block)
     saved_method = ActionMailer::Base.delivery_method
     if m = saved_method.to_s.match(%r{^async_(.+)$})
-      ActionMailer::Base.delivery_method = m[1].to_sym
+      synched_method = m[1]
+      ActionMailer::Base.delivery_method = synched_method.to_sym
+      ActionMailer::Base.send "#{synched_method}_settings=", ActionMailer::Base.send("async_#{synched_method}_settings")
     end
     yield
   ensure