Merged r9367 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9375 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-09 06:22:31 +00:00
parent c229ea6386
commit 86ee285eb4
2 changed files with 15 additions and 2 deletions

View File

@ -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

View File

@ -35,7 +35,9 @@ namespace :redmine do
options[:project] = ENV['project'] if ENV['project']
options[:tracker] = ENV['tracker'].to_i if ENV['tracker']
options[:users] = (ENV['users'] || '').split(',').each(&:strip!)
Mailer.reminders(options)
Mailer.with_synched_deliveries do
Mailer.reminders(options)
end
end
end