diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-03-15 20:02:46 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-03-15 20:02:46 +0000 |
| commit | b2dd357d226273500c42935e389e81091f64231c (patch) | |
| tree | a468eae4e516db8765ec735e5bdbc2ef079be584 | |
| parent | a02c6070f052b9f52803b02a41defb10262cfa6c (diff) | |
| download | rails-b2dd357d226273500c42935e389e81091f64231c.tar.gz rails-b2dd357d226273500c42935e389e81091f64231c.tar.bz2 rails-b2dd357d226273500c42935e389e81091f64231c.zip | |
Fixed that cache fetch method would cause nil exception when called with no options (closes #11253) [remy]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9032 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 7929886781..08cbd13876 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -54,7 +54,7 @@ module ActionController #:nodoc: protected # Convenience accessor - def cache(key, options = nil, &block) + def cache(key, options = {}, &block) if cache_configured? cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller), options, &block) else |