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

@@ -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