diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-11 11:46:12 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-11 11:46:12 +0000 |
| commit | a67beac9d0db8e7dd88267ac5eeefc49ffbd46ce (patch) | |
| tree | b66bfd77207084141ddc2a695b3a87bc98f8bddb /actionmailer/lib/action_mailer | |
| parent | 256e800a0125cdd724bb7bdefc091f36b872896f (diff) | |
| download | rails-a67beac9d0db8e7dd88267ac5eeefc49ffbd46ce.tar.gz rails-a67beac9d0db8e7dd88267ac5eeefc49ffbd46ce.tar.bz2 rails-a67beac9d0db8e7dd88267ac5eeefc49ffbd46ce.zip | |
Dont quote the body
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 02e9bd2ad5..a20197c754 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -100,9 +100,9 @@ module ActionMailer #:nodoc: class << self def method_missing(method_symbol, *parameters)#:nodoc: case method_symbol.id2name - when /^create_([_a-z]*)/ + when /^create_([_a-z]\w*)/ create_from_action($1, *parameters) - when /^deliver_([_a-z]*)/ + when /^deliver_([_a-z]\w*)/ begin deliver(send("create_" + $1, *parameters)) rescue Object => e @@ -121,7 +121,8 @@ module ActionMailer #:nodoc: charset = @@default_charset ) #:nodoc: m = TMail::Mail.new - m.subject, m.body = quote_any_if_necessary(charset, subject, body) + m.body = body + m.subject, = quote_any_if_necessary(charset, subject) m.to, m.from = quote_any_address_if_necessary(charset, to, from) m.date = timestamp.respond_to?("to_time") ? timestamp.to_time : (timestamp || Time.now) |