diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-09 06:22:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-09 06:22:31 +0000 |
| commit | 86ee285eb43bf0b927beebfa57714bf277f0ac8e (patch) | |
| tree | 99a206b0b8b0fcdd55b7ac526892187200bf64ee /app/models | |
| parent | c229ea63868ea27d6e94d8e74d6b4b10303157a8 (diff) | |
| download | redmine-86ee285eb43bf0b927beebfa57714bf277f0ac8e.tar.gz redmine-86ee285eb43bf0b927beebfa57714bf277f0ac8e.zip | |
Merged r9367 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9375 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/mailer.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 22b99edf6..96bb83c57 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -372,6 +372,17 @@ class Mailer < ActionMailer::Base ActionMailer::Base.perform_deliveries = was_enabled end + # Sends emails synchronously in the given block + 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 + end + yield + ensure + ActionMailer::Base.delivery_method = saved_method + end + private def initialize_defaults(method_name) super |