diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 00:18:41 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 00:18:41 -0800 |
commit | 97204fc0bc52af8fb6714e6f9fcd414567e0fc1a (patch) | |
tree | 929b542e944fdb0e13eff509d690f032e2f581b4 /actionmailer/lib | |
parent | 8734f9a2710e6ad62caa7e1dcf543b83562e18ed (diff) | |
parent | 345e622a20fd14a356a69da40e527075b1117b52 (diff) | |
download | rails-97204fc0bc52af8fb6714e6f9fcd414567e0fc1a.tar.gz rails-97204fc0bc52af8fb6714e6f9fcd414567e0fc1a.tar.bz2 rails-97204fc0bc52af8fb6714e6f9fcd414567e0fc1a.zip |
Merge commit 'mikel/master'
Diffstat (limited to 'actionmailer/lib')
-rw-r--r-- | actionmailer/lib/action_mailer.rb | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/tmail_compat.rb | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 55ddbb24f4..039715c2f5 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -45,3 +45,5 @@ module Text autoload :Format, 'action_mailer/vendor/text_format' end + +require 'action_mailer/tmail_compat'
\ No newline at end of file diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb new file mode 100644 index 0000000000..cacd79be27 --- /dev/null +++ b/actionmailer/lib/action_mailer/tmail_compat.rb @@ -0,0 +1,10 @@ +module Mail + class Message + + def set_content_type(*args) + STDERR.puts("Message#set_content_type is deprecated, please just call Message#content_type with the same arguments.\n#{caller}") + content_type(*args) + end + + end +end
\ No newline at end of file |