diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-06 14:56:51 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-06 14:57:25 +0200 |
| commit | d42bb6843073b876e6a79e396a947c267fcbbf75 (patch) | |
| tree | ebaebf7d9a59bbf5531b89a8fe185e838dd5e33b /actionmailer | |
| parent | 894bdbd53dd82b6b28ff2672b85f57ed5ce97759 (diff) | |
| download | rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.gz rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.bz2 rails-d42bb6843073b876e6a79e396a947c267fcbbf75.zip | |
More updates to ivars list.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f80e54f834..f00a0c8ae0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -349,6 +349,8 @@ module ActionMailer #:nodoc: include AbstractController::Translation include AbstractController::AssetPaths + self.protected_instance_variables = %w(@_action_has_layout) + helper ActionMailer::MailHelper include ActionMailer::OldApi diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index 04728cafb0..bfa9499764 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -8,7 +8,7 @@ module ActionMailer included do extend ActionMailer::AdvAttrAccessor - self.protected_instance_variables.concat %w(@parts @mail_was_called) + self.protected_instance_variables.concat %w(@parts @mail_was_called @headers) # Specify the BCC addresses for the message adv_attr_accessor :bcc |