aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-04 02:56:28 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-04 02:56:28 -0200
commit8bdbf88dfd231f80b8e757b36e77ff72e6b6b83c (patch)
treef30bb30908932151abfa14850f230b48820bb014 /actionmailer
parent418abd0111dfc9e83307a34a5c945a21ca738a8e (diff)
parent50593cc205fbcc0d2cec1d12d28a35ed6ceb3c2a (diff)
downloadrails-8bdbf88dfd231f80b8e757b36e77ff72e6b6b83c.tar.gz
rails-8bdbf88dfd231f80b8e757b36e77ff72e6b6b83c.tar.bz2
rails-8bdbf88dfd231f80b8e757b36e77ff72e6b6b83c.zip
Merge pull request #22482 from ridiculous/master
Replace ActionMailer::Base.respond_to? with respond_to_missing?
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 0b12860619..cbbf480da8 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -541,10 +541,6 @@ module ActionMailer
end
end
- def respond_to?(method, include_private = false) #:nodoc:
- super || action_methods.include?(method.to_s)
- end
-
protected
def set_payload_for_mail(payload, mail) #:nodoc:
@@ -566,6 +562,12 @@ module ActionMailer
super
end
end
+
+ private
+
+ def respond_to_missing?(method, include_all = false) #:nodoc:
+ action_methods.include?(method.to_s)
+ end
end
attr_internal :message