diff --git a/actionpack/lib/abstract_controller/caching.rb b/actionpack/lib/abstract_controller/caching.rb index ce6b757c3c..5e9cb4d2f9 100644 --- a/actionpack/lib/abstract_controller/caching.rb +++ b/actionpack/lib/abstract_controller/caching.rb @@ -15,7 +15,7 @@ module AbstractController end def cache_store=(store) - config.cache_store = ActiveSupport::Cache.lookup_store(store) + config.cache_store = ActiveSupport::Cache.lookup_store(*store) end private diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index fc17d17bef..b7c029018b 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -54,7 +54,6 @@ module ActiveSupport # ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new) # # => returns MyOwnCacheStore.new def lookup_store(store = nil, *parameters) - case store when Symbol options = parameters.extract_options!