aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/cache.rb
diff options
context:
space:
mode:
authorBrian Durand <brian@embellishedvisions.com>2011-08-01 12:05:29 -0500
committerBrian Durand <brian@embellishedvisions.com>2011-08-01 12:05:29 -0500
commitfec4c5ad76a4955364e091296b68bb7ac12bc928 (patch)
tree2331a32ebbae17a7f916e6c927f96de9e5206ef5 /activesupport/lib/active_support/cache.rb
parentcaacf85673b880d22d23443e32c24234e3b2f347 (diff)
downloadrails-fec4c5ad76a4955364e091296b68bb7ac12bc928.tar.gz
rails-fec4c5ad76a4955364e091296b68bb7ac12bc928.tar.bz2
rails-fec4c5ad76a4955364e091296b68bb7ac12bc928.zip
Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the delete_entry call.
Diffstat (limited to 'activesupport/lib/active_support/cache.rb')
-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 ac88c82709..a5aacb60ee 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