Merged r10147 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@10302 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ca988cdd88732dfa9c1649db7c71c566a9e35f2b..1f9a04af410686d1241b9537dc745531f82053fa 100644 (file)
--- 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