diff options
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 |