aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2007-01-31 20:57:19 +0000
committerMichael Koziarski <michael@koziarski.com>2007-01-31 20:57:19 +0000
commit416091d8b50ac855f175c004821a5d9831e21bd0 (patch)
tree38843836cc1dd1183d1879bfbe24b038274ce884 /actionmailer
parent5c0227edc9fe3392a774a52cbeb9ca8cad4a4e65 (diff)
downloadrails-416091d8b50ac855f175c004821a5d9831e21bd0.tar.gz
rails-416091d8b50ac855f175c004821a5d9831e21bd0.tar.bz2
rails-416091d8b50ac855f175c004821a5d9831e21bd0.zip
Fix missed smtp_session changes to base.rb.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6097 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 6bbc710942..5de9331674 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -550,8 +550,8 @@ module ActionMailer #:nodoc:
destinations = mail.destinations
mail.ready_to_send
- Net::SMTP.start(server_settings[:address], server_settings[:port], server_settings[:domain],
- server_settings[:user_name], server_settings[:password], server_settings[:authentication]) do |smtp|
+ Net::SMTP.start(smtp_settings[:address], smtp_settings[:port], smtp_settings[:domain],
+ smtp_settings[:user_name], smtp_settings[:password], smtp_settings[:authentication]) do |smtp|
smtp.sendmail(mail.encoded, mail.from, destinations)
end
end