diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-08 21:12:45 +1000 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-11 18:04:55 +1000 |
| commit | 03dd8f79171fb593d14c43be8ddf520d76b1f62f (patch) | |
| tree | b8b76972d0294ba705a23064bdde178ededdcc38 /actionmailer | |
| parent | e157a3d2224253303719c92b262413dfc735b6de (diff) | |
| download | rails-03dd8f79171fb593d14c43be8ddf520d76b1f62f.tar.gz rails-03dd8f79171fb593d14c43be8ddf520d76b1f62f.tar.bz2 rails-03dd8f79171fb593d14c43be8ddf520d76b1f62f.zip | |
Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/test/old_base/mail_service_test.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 8a064829c7..dbda0d87b2 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 +* Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8 + * 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. diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 9cf01854c5..b68e7fcbac 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -355,7 +355,7 @@ class ActionMailerTest < Test::Unit::TestCase assert_equal "multipart/mixed", created.mime_type assert_equal "multipart/alternative", created.parts[0].mime_type assert_equal "bar", created.parts[0].header['foo'].to_s - assert_nil created.parts[0].charset + assert_not_nil created.parts[0].charset assert_equal "text/plain", created.parts[0].parts[0].mime_type assert_equal "text/html", created.parts[0].parts[1].mime_type assert_equal "application/octet-stream", created.parts[1].mime_type |