aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-06 14:32:48 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-06 14:57:25 +0200
commit894bdbd53dd82b6b28ff2672b85f57ed5ce97759 (patch)
tree6f6e2b8105891f1600b5b173f6805a1a3c6e8ea9 /actionmailer
parentbe9857c21d9bf3e4c51a159b7d4edef69e203a57 (diff)
downloadrails-894bdbd53dd82b6b28ff2672b85f57ed5ce97759.tar.gz
rails-894bdbd53dd82b6b28ff2672b85f57ed5ce97759.tar.bz2
rails-894bdbd53dd82b6b28ff2672b85f57ed5ce97759.zip
Move variables to underscore format, update protected instance variables list.
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 1e91d62e24..f80e54f834 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -349,9 +349,6 @@ module ActionMailer #:nodoc:
include AbstractController::Translation
include AbstractController::AssetPaths
- cattr_reader :protected_instance_variables
- @@protected_instance_variables = []
-
helper ActionMailer::MailHelper
include ActionMailer::OldApi