diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-10-30 18:43:57 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-10-30 18:43:57 +0000 |
| commit | 7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4 (patch) | |
| tree | 6db2b2e3a163a97547690724838a886e47f875e7 /actionmailer/lib | |
| parent | e0fb16b92adb0d708e0a5bc258c76a367866eed2 (diff) | |
| download | rails-7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4.tar.gz rails-7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4.tar.bz2 rails-7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4.zip | |
Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*args).deliver`."
This reverts commit 7e0cf563639bc7508da381b1b8321c7a89be1aa8.
Conflicts:
actionmailer/CHANGELOG.md
See discussion at
https://github.com/rails/rails/commit/7e0cf563639bc7508da381b1b8321c7a89be1aa8#commitcomment-2075489
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 4d1c697502..a66e81f1c3 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -142,7 +142,6 @@ module ActionMailer # for delivery later: # # Notifier.welcome(david).deliver # sends the email - # Notifier.deliver_welcome(david) # synonym for the former # mail = Notifier.welcome(david) # => a Mail::Message object # mail.deliver # sends the email # @@ -488,8 +487,6 @@ module ActionMailer def method_missing(method_name, *args) if action_methods.include?(method_name.to_s) QueuedMessage.new(queue, self, method_name, *args) - elsif method_name.to_s =~ /^deliver_(.+)$/ && action_methods.include?($1) - public_send($1, *args).deliver else super end |