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
2008-03-15 20:02:46 +00:00 · 2008-03-15 20:02:46 +00:00 · b2dd357d22
commit b2dd357d22
parent a02c6070f0
1 changed files with 1 additions and 1 deletions
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@ -54,7 +54,7 @@ def self.cache_configured?

    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