Defect #15113 ยป mailer_return_value.patch
| app/models/mailer.rb | ||
|---|---|---|
|
ActionMailer::Base.delivery_method = saved_method
|
||
|
end
|
||
|
def mail(headers={})
|
||
|
def mail(headers={}, &block)
|
||
|
headers.merge! 'X-Mailer' => 'Redmine',
|
||
|
'X-Redmine-Host' => Setting.host_name,
|
||
|
'X-Redmine-Site' => Setting.app_title,
|
||
| ... | ... | |
|
headers[:references] = @references_objects.collect {|o| "<#{self.class.message_id_for(o)}>"}.join(' ')
|
||
|
end
|
||
|
super headers do |format|
|
||
|
format.text
|
||
|
format.html unless Setting.plain_text_mail?
|
||
|
end
|
||
|
set_language_if_valid @initial_language
|
||
|
if block_given?
|
||
|
super headers, &block
|
||
|
else
|
||
|
super headers do |format|
|
||
|
format.text
|
||
|
format.html unless Setting.plain_text_mail?
|
||
|
end
|
||
|
end
|
||
|
end
|
||
|
def initialize(*args)
|
||