aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/tmail_compat.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2010-01-04 03:24:39 +0530
committerPratik Naik <pratiknaik@gmail.com>2010-01-04 03:24:39 +0530
commitcda36a0731f14b33a920bf7e32255661e06f890a (patch)
tree79ccba37953f9fe3055503be42b1610faa6d64ad /actionmailer/lib/action_mailer/tmail_compat.rb
parentbd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff)
parenta115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff)
downloadrails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz
rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2
rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionmailer/lib/action_mailer/tmail_compat.rb')
-rw-r--r--actionmailer/lib/action_mailer/tmail_compat.rb20
1 files changed, 20 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/tmail_compat.rb b/actionmailer/lib/action_mailer/tmail_compat.rb
new file mode 100644
index 0000000000..2fd25ff145
--- /dev/null
+++ b/actionmailer/lib/action_mailer/tmail_compat.rb
@@ -0,0 +1,20 @@
+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
+
+ 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