diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-31 17:15:06 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-31 17:15:06 -0800 |
| commit | 6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc (patch) | |
| tree | 2719006c11a209156f787d3b18aad05c0f89f61c /actionmailer/lib/action_mailer/tmail_compat.rb | |
| parent | 58ad6567692ee44b91bd05833b6cb6c454481e19 (diff) | |
| parent | 94838fbe392d2a4084c3a22d8df9eebb7674b3b1 (diff) | |
| download | rails-6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc.tar.gz rails-6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc.tar.bz2 rails-6ce562c9fff4084e185c3c57cc609d3bf5ac0cfc.zip | |
Merge commit 'mikel/master'
Diffstat (limited to 'actionmailer/lib/action_mailer/tmail_compat.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/tmail_compat.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb index cacd79be27..2fd25ff145 100644 --- a/actionmailer/lib/action_mailer/tmail_compat.rb +++ b/actionmailer/lib/action_mailer/tmail_compat.rb @@ -6,5 +6,15 @@ module Mail content_type(*args) end + alias :old_transfer_encoding :transfer_encoding + def transfer_encoding(value = nil) + if value + STDERR.puts("Message#transfer_encoding is deprecated, please call Message#content_transfer_encoding with the same arguments.\n#{caller}") + content_transfer_encoding(value) + else + old_transfer_encoding + end + end + end end
\ No newline at end of file |