aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-07 03:51:06 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-07 03:51:06 -0800
commit0c1846e4091dcdd48b35909b5bb3b00c58fa9d10 (patch)
tree551a9c764b0f182602a59abcac286c95a0f627c0 /actionmailer/lib/action_mailer/base.rb
parentba168e8f067d72f7a21691f4cfdcd40432135246 (diff)
parent7d862359d0ebe8c173ef2e069dcbf2c69f43d798 (diff)
downloadrails-0c1846e4091dcdd48b35909b5bb3b00c58fa9d10.tar.gz
rails-0c1846e4091dcdd48b35909b5bb3b00c58fa9d10.tar.bz2
rails-0c1846e4091dcdd48b35909b5bb3b00c58fa9d10.zip
Merge pull request #4377 from lest/instance-variables-1-9
get rid of using instance_variable_names method from AS
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index f5eb423073..7d8852f961 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -332,7 +332,7 @@ module ActionMailer #:nodoc:
include AbstractController::Translation
include AbstractController::AssetPaths
- self.protected_instance_variables = %w(@_action_has_layout)
+ self.protected_instance_variables = [:@_action_has_layout]
helper ActionMailer::MailHelper