diff options
| author | José Valim <jose.valim@gmail.com> | 2009-10-28 10:33:05 -0200 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-11-01 02:23:49 +0100 |
| commit | 976c2647240fd40a2b706ab5e41856cd47e7b212 (patch) | |
| tree | 424a54f1b025cf8e3d17dcd15632d68eb62a78ef /actionpack/lib/action_view | |
| parent | a107103e85a2cc294faedddbb44707fd2bc2e206 (diff) | |
| download | rails-976c2647240fd40a2b706ab5e41856cd47e7b212.tar.gz rails-976c2647240fd40a2b706ab5e41856cd47e7b212.tar.bz2 rails-976c2647240fd40a2b706ab5e41856cd47e7b212.zip | |
Extracted localized_cache.rb from ActionController, added it to AbstractController and made ActionMailer use it.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 84e4103280..c33695770f 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -187,11 +187,11 @@ module ActionView #:nodoc: def reset_formats(formats) @formats = formats - if defined?(ActionController) + if defined?(AbstractController::HashKey) # This is expensive, but we need to reset this when the format is updated, # which currently only happens Thread.current[:format_locale_key] = - ActionController::HashKey.get(self.class, formats, I18n.locale) + AbstractController::HashKey.get(self.class, formats, I18n.locale) end end |