diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-17 17:30:15 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-17 17:30:15 +0000 |
| commit | baae5a1468d22700cf7bf7e35804b69d7758dd0b (patch) | |
| tree | 39d2592649cd4398fc807e16f1db34097cc46164 /actionmailer | |
| parent | 58f920fecd5133611294412ae7e61592cc809939 (diff) | |
| download | rails-baae5a1468d22700cf7bf7e35804b69d7758dd0b.tar.gz rails-baae5a1468d22700cf7bf7e35804b69d7758dd0b.tar.bz2 rails-baae5a1468d22700cf7bf7e35804b69d7758dd0b.zip | |
Fixed sending of emails to use Tmail#from not the deprecated Tmail#from_address
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@446 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 5 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 783e92dd2a..d6c7e62777 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* Fixed sending of emails to use Tmail#from not the deprecated Tmail#from_address + + *0.6* (January 17th, 2005) * Fixed that bcc and cc should be settable through @bcc and @cc -- not just @headers["Bcc"] and @headers["Cc"] #453 [Eric Hodel] diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 8390e70f4a..61701d62b7 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -128,7 +128,7 @@ module ActionMailer #:nodoc: def perform_delivery_smtp(mail) Net::SMTP.start(server_settings[:address], server_settings[:port], server_settings[:domain], server_settings[:user_name], server_settings[:password], server_settings[:authentication]) do |smtp| - smtp.sendmail(mail.encoded, mail.from_address, mail.destinations) + smtp.sendmail(mail.encoded, mail.from, mail.destinations) end end |