aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-22 09:58:49 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-22 09:58:49 -0800
commit4e6050b9614d178c28cce45f1c33ad9d1666e330 (patch)
treef5fa75b3fa41e675b2834fc590b743b4d8ef769e /actionmailer
parent1f9d6a0bf1307eb45d676b88dcdde87355b5b90d (diff)
parentc0a445617ff431f4ad67b9366bdc5f06b4e39de8 (diff)
downloadrails-4e6050b9614d178c28cce45f1c33ad9d1666e330.tar.gz
rails-4e6050b9614d178c28cce45f1c33ad9d1666e330.tar.bz2
rails-4e6050b9614d178c28cce45f1c33ad9d1666e330.zip
Merge pull request #4605 from lest/patch-1
remove obsolete code as old actionmailer api was removed
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index f5d1121fa5..457ee24a0f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -602,9 +602,6 @@ module ActionMailer #:nodoc:
# end
#
def mail(headers={}, &block)
- # Guard flag to prevent both the old and the new API from firing
- # Should be removed when old API is removed
- @mail_was_called = true
m = @_message
# At the beginning, do not consider class default for parts order neither content_type