diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-08 21:11:42 +1000 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-11 18:04:55 +1000 |
| commit | e157a3d2224253303719c92b262413dfc735b6de (patch) | |
| tree | 7dc413990f432c6cc9ee10ec4a8bbf310e608872 /actionmailer | |
| parent | 6c6bef245a7b636cbd6a0162cc5061d8c040aadb (diff) | |
| download | rails-e157a3d2224253303719c92b262413dfc735b6de.tar.gz rails-e157a3d2224253303719c92b262413dfc735b6de.tar.bz2 rails-e157a3d2224253303719c92b262413dfc735b6de.zip | |
Added explict setting of charset in set_fields! method to make sure Mail has the user defined default
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 697e0887ed..8a064829c7 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -5,6 +5,8 @@ ActionMailer::Base.register_interceptor calls Mail.register_interceptor ActionMailer::Base.register_observer calls Mail.register_observer +* Added explict setting of charset in set_fields! method to make sure Mail has the user defined default + * Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header. * Fixed several tests which had incorrect encoding. diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 5dbe1738a1..c96ceb72f9 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -579,6 +579,7 @@ module ActionMailer #:nodoc: 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] |