diff options
| author | Olek Janiszewski <olek.janiszewski@gmail.com> | 2011-11-23 18:06:15 +0100 |
|---|---|---|
| committer | Olek Janiszewski <olek.janiszewski@gmail.com> | 2011-11-23 18:06:16 +0100 |
| commit | d8e6dc9cf12096908a7a53dec07a397ba23b1088 (patch) | |
| tree | f7c8682da6c26d8e888f4ac029fce8b461044260 /activesupport/lib/active_support/cache.rb | |
| parent | a93ee92da2b9ba83e3a3fe0b8d4dd5cac2790f15 (diff) | |
| download | rails-d8e6dc9cf12096908a7a53dec07a397ba23b1088.tar.gz rails-d8e6dc9cf12096908a7a53dec07a397ba23b1088.tar.bz2 rails-d8e6dc9cf12096908a7a53dec07a397ba23b1088.zip | |
Fix #3737 AS::expand_cache_key generates wrong key in certain situations
`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 2bf24558a6..cfd1a6dbe3 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -81,16 +81,10 @@ module ActiveSupport end expanded_cache_key << - if key.respond_to?(:cache_key) - key.cache_key - elsif key.is_a?(Array) - if key.size > 1 - key.collect { |element| expand_cache_key(element) }.to_param - else - key.first.to_param - end - elsif key - key.to_param + case + when key.respond_to?(:cache_key) then key.cache_key + when key.is_a?(Array) then key.map { |element| expand_cache_key(element) }.to_param + when key then key.to_param end.to_s expanded_cache_key |