diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-31 18:09:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-31 18:09:33 +0000 |
| commit | c57a2974d16e7ce9706f0bc7aab279c53b4895fc (patch) | |
| tree | 8958ea436888e7f8b83b25e7dd6ed689e667314b /app/models/mailer.rb | |
| parent | 77d94818a497a86ce5f5fed94dc7e1b568aa6fb7 (diff) | |
| download | redmine-c57a2974d16e7ce9706f0bc7aab279c53b4895fc.tar.gz redmine-c57a2974d16e7ce9706f0bc7aab279c53b4895fc.zip | |
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
Diffstat (limited to 'app/models/mailer.rb')
| -rw-r--r-- | app/models/mailer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |