kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

First pass on fixing delivery method

Browse source
This commit is contained in:
Mikel Lindsaar 2010-01-19 23:36:49 +11:00
parent d201d39437
commit c8e2998701
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
actionmailer/lib/action_mailer/base.rb
View file

@ -354,7 +354,8 @@ module ActionMailer #:nodoc:
# Alias controller_path to mailer_name so render :partial in views work.
alias :controller_path :mailer_name
class_inheritable_accessor :delivery_method
superclass_delegating_accessor :delivery_method
self.delivery_method = :smtp
class << self
@ -369,12 +370,6 @@ module ActionMailer #:nodoc:
@delivery_settings ||= {:file => {:location => defined?(Rails.root) ? "#{Rails.root}/tmp/mails" : "#{Dir.tmpdir}/mails"}}
end
# Setup the default settings for Mail delivery
Mail.defaults do
method = ActionMailer::Base.delivery_method ||= :smtp
delivery_method method
end
alias :controller_path :mailer_name
def respond_to?(method_symbol, include_private = false) #:nodoc:
@ -390,6 +385,7 @@ module ActionMailer #:nodoc:
else super
end
elsif match = matches_settings_method?(method_symbol)
# TODO Deprecation warning
delivery_settings[match[1].to_sym] = parameters[0]
else
super
@ -463,7 +459,7 @@ module ActionMailer #:nodoc:
end
private
def get_delivery_settings(method) #:nodoc:
method.is_a?(Symbol) ? delivery_settings[method] : delivery_settings[:custom]
end