diff options
| author | Ryan Bigg <radarlistener@gmail.com> | 2008-10-06 11:57:12 +1030 |
|---|---|---|
| committer | Ryan Bigg <radarlistener@gmail.com> | 2008-10-06 11:57:12 +1030 |
| commit | a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7 (patch) | |
| tree | bb0b0e9423d4e259de6041e661bba119f7871faa /actionmailer/lib | |
| parent | b340337aaff5b59fdf2110207fec3e1c43f1380a (diff) | |
| parent | 6090513cfb8acb5554a6653a6f2cb87648585d41 (diff) | |
| download | rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.tar.gz rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.tar.bz2 rails-a21d8f632fe8aa3bf4c1b83accc7a2dd230c28e7.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
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 |