From 7e17b0baec4ea811c1a7e3bd491eaedf95b1feb4 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 30 Oct 2012 18:43:57 +0000
Subject: 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
---
 actionmailer/lib/action_mailer/base.rb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'actionmailer/lib/action_mailer/base.rb')

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
-- 
cgit v1.2.3