aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorBrian Durand <brian@embellishedvisions.com>2011-08-01 12:05:29 -0500
committerXavier Noria <fxn@hashref.com>2011-08-13 16:22:27 -0700
commit05d4b9d2fdb0aceb9082303301ecaf77605288a0 (patch)
tree46769c7148838fefa6cacad50aff917ec1aff580 /activesupport/lib/active_support
parentcc78a8f04cb8a4ced280e73de6337cec25070a8e (diff)
downloadrails-05d4b9d2fdb0aceb9082303301ecaf77605288a0.tar.gz
rails-05d4b9d2fdb0aceb9082303301ecaf77605288a0.tar.bz2
rails-05d4b9d2fdb0aceb9082303301ecaf77605288a0.zip
Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the delete_entry call.
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/cache.rb2
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