diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-11-06 14:21:40 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-11-06 14:21:40 -0800 |
| commit | 267e5c84f96b96f8eac9f4a3dcdce5bc1b82541c (patch) | |
| tree | 1d04c31abe1fc5117e5fe198aaf6c2c790aad1af /actionmailer | |
| parent | c8b566d54da278a8e675115bcf2e9590f75f5eb5 (diff) | |
| download | rails-267e5c84f96b96f8eac9f4a3dcdce5bc1b82541c.tar.gz rails-267e5c84f96b96f8eac9f4a3dcdce5bc1b82541c.tar.bz2 rails-267e5c84f96b96f8eac9f4a3dcdce5bc1b82541c.zip | |
calculate the ivars to remove in advance as a set and cache them in a
constant.
`view_assigns` can use the precalculated sets and remove instance
variables without allocating any extra arrays
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index becd4126f4..2207f119c3 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -373,7 +373,11 @@ module ActionMailer include AbstractController::AssetPaths include AbstractController::Callbacks - self.protected_instance_variables = [:@_action_has_layout] + PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout] + + def _protected_ivars # :nodoc: + PROTECTED_IVARS + end helper ActionMailer::MailHelper |