diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 16:28:26 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 17:36:08 -0800 |
| commit | 9a650a6547d2a83004db1bf913e26a8daa1c0b6e (patch) | |
| tree | 28ba954aa7ea327187e30b98faf044bf9cfbf201 /actionpack/lib/abstract_controller | |
| parent | 6d390671f639b3314437054df0d393cef10493bd (diff) | |
| download | rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.tar.gz rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.tar.bz2 rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.zip | |
Silence some trivial warnings: shadowed local vars, indentation mismatches
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/localized_cache.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 46760bba7c..4073e9b386 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -20,7 +20,7 @@ module AbstractController end def clear_template_caches! - @found_layouts.clear if @found_layouts + @found_layouts.clear if defined? @found_layouts super end diff --git a/actionpack/lib/abstract_controller/localized_cache.rb b/actionpack/lib/abstract_controller/localized_cache.rb index ee7b43cb9f..bf648af60a 100644 --- a/actionpack/lib/abstract_controller/localized_cache.rb +++ b/actionpack/lib/abstract_controller/localized_cache.rb @@ -1,6 +1,6 @@ module AbstractController class HashKey - @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|h,k| h[k] = {} } } + @hash_keys = Hash.new {|h,k| h[k] = Hash.new {|sh,sk| sh[sk] = {} } } def self.get(klass, formats, locale) @hash_keys[klass][formats][locale] ||= new(klass, formats, locale) |