aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-22 13:34:57 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-22 13:34:57 +0000
commit148f6d8fb6ea028b2738a0553f058e903268a0b8 (patch)
treeedfc549dd7793ff03cd78e92c521f037060e4b50 /actionmailer/lib
parentcf659de14140950638f2f02831a42721fd8d2f75 (diff)
downloadrails-148f6d8fb6ea028b2738a0553f058e903268a0b8.tar.gz
rails-148f6d8fb6ea028b2738a0553f058e903268a0b8.tar.bz2
rails-148f6d8fb6ea028b2738a0553f058e903268a0b8.zip
Made Action Mailer templates use UTF-8 as default
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@739 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 8b04c42ee0..67141c461b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -140,13 +140,12 @@ module ActionMailer #:nodoc:
send("perform_delivery_#{delivery_method}", mail) if perform_deliveries
end
- def quoted_printable( text, charset )
- text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.
- gsub( / /, "_" )
+ def quoted_printable(text, charset)
+ text = text.gsub( /[^a-z ]/i ) { "=%02x" % $&[0] }.gsub( / /, "_" )
"=?#{charset}?Q?#{text}?="
end
- private
+ private
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|