diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-01 10:58:48 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-01 10:58:48 -0700 |
| commit | 6e701e8735df9bf49549e43f001af6a446148b03 (patch) | |
| tree | 718202d3381c188621490d397d4d6019b6bab2f7 /activesupport/lib | |
| parent | 5c26f56b17ec51489c24e9a256a6d577aa94eae7 (diff) | |
| parent | fec4c5ad76a4955364e091296b68bb7ac12bc928 (diff) | |
| download | rails-6e701e8735df9bf49549e43f001af6a446148b03.tar.gz rails-6e701e8735df9bf49549e43f001af6a446148b03.tar.bz2 rails-6e701e8735df9bf49549e43f001af6a446148b03.zip | |
Merge pull request #2393 from bdurand/fix_cache_read_multi
Fix ArgumentError in ActiveSupport::Cache::CacheStore.read_multi
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 2d2264e58a..95d936b32f 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -347,7 +347,7 @@ module ActiveSupport entry = read_entry(key, options) if entry if entry.expired? - delete_entry(key) + delete_entry(key, options) else results[name] = entry.value end |