diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-09-28 12:31:45 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-09-28 12:31:45 -0500 |
commit | 28bf2fa03886e3ea7d873375239395b91b8e530e (patch) | |
tree | 0d3d6982867a9c054b1f6f45c285a303d8d28cc8 /actionmailer/lib | |
parent | ea609b265ffc30cac00bf09a262027f96964ed6f (diff) | |
download | rails-28bf2fa03886e3ea7d873375239395b91b8e530e.tar.gz rails-28bf2fa03886e3ea7d873375239395b91b8e530e.tar.bz2 rails-28bf2fa03886e3ea7d873375239395b91b8e530e.zip |
Protect body ivar from being clobbered by the mailer template assigns
Diffstat (limited to 'actionmailer/lib')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index bfe435550b..043f56ba17 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -296,6 +296,9 @@ module ActionMailer #:nodoc: @@default_implicit_parts_order = [ "text/html", "text/enriched", "text/plain" ] cattr_accessor :default_implicit_parts_order + cattr_reader :protected_instance_variables + @@protected_instance_variables = %w(@body) + # Specify the BCC addresses for the message adv_attr_accessor :bcc |