From b5f9a9fce316e96ffb9ab3a69e9311f8b1e56fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 12 Apr 2010 10:25:02 +0200 Subject: Move set_fields! to the old API module. --- actionmailer/lib/action_mailer/old_api.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib/action_mailer/old_api.rb') diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index 24c6ec8eda..b2111209c7 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -143,7 +143,7 @@ module ActionMailer { :content_type => content_type, :content_disposition => content_disposition }.merge(params) end - + def create_mail m = @_message @@ -230,6 +230,17 @@ module ActionMailer ) end + def set_fields!(headers, charset) #:nodoc: + m = @_message + m.charset = charset + m.subject ||= headers.delete(:subject) if headers[:subject] + m.to ||= headers.delete(:to) if headers[:to] + m.from ||= headers.delete(:from) if headers[:from] + m.cc ||= headers.delete(:cc) if headers[:cc] + m.bcc ||= headers.delete(:bcc) if headers[:bcc] + m.reply_to ||= headers.delete(:reply_to) if headers[:reply_to] + end + def split_content_type(ct) ct.to_s.split("/") end -- cgit v1.2.3