aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/delivery_methods.rb
diff options
context:
space:
mode:
authorJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-22 14:38:41 +0100
committerJosé Valim and Mikel Lindsaar <pair@programming.com>2010-01-22 14:38:41 +0100
commit951397b4a2143eee4b900356dab525aed99430ec (patch)
treef3cd7db8376015d9c2cb2fe1467c2c7c2f2bc520 /actionmailer/lib/action_mailer/delivery_methods.rb
parent1cd55928c6f638affeb5d89293f478817675d7b3 (diff)
downloadrails-951397b4a2143eee4b900356dab525aed99430ec.tar.gz
rails-951397b4a2143eee4b900356dab525aed99430ec.tar.bz2
rails-951397b4a2143eee4b900356dab525aed99430ec.zip
Get implicit multipart and attachments working together.
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_methods.rb')
-rw-r--r--actionmailer/lib/action_mailer/delivery_methods.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_methods.rb b/actionmailer/lib/action_mailer/delivery_methods.rb
index c8c4148353..5883e446f2 100644
--- a/actionmailer/lib/action_mailer/delivery_methods.rb
+++ b/actionmailer/lib/action_mailer/delivery_methods.rb
@@ -27,6 +27,7 @@ module ActionMailer
end
module ClassMethods
+ # TODO Make me class inheritable
def delivery_settings
@@delivery_settings ||= Hash.new { |h,k| h[k] = {} }
end
@@ -51,6 +52,7 @@ module ActionMailer
protected
+ # TODO Get rid of this method missing magic
def method_missing(method_symbol, *parameters) #:nodoc:
if match = matches_settings_method?(method_symbol)
if match[2]