From b2dd357d226273500c42935e389e81091f64231c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 15 Mar 2008 20:02:46 +0000
Subject: [PATCH] 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
---
 actionpack/lib/action_controller/caching.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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