Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8987 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 6 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb
index 4ba4e626e2..a17782cafc 100644
--- a/actionpack/lib/action_controller/mime_responds.rb
+++ b/actionpack/lib/action_controller/mime_responds.rb
@@ -125,7 +125,7 @@ module ActionController #:nodoc:
 
         @order << mime_type
 
-        @responses[mime_type] = Proc.new do
+        @responses[mime_type] ||= Proc.new do
           @response.template.template_format = mime_type.to_sym
           @response.content_type = mime_type.to_s
           block_given? ? block.call : @controller.send(:render, :action => @controller.action_name)
@@ -133,7 +133,11 @@ module ActionController #:nodoc:
       end
 
       def any(*args, &block)
-        args.each { |type| send(type, &block) }
+        if args.any?
+          args.each { |type| send(type, &block) }
+        else
+          custom(@mime_type_priority.first, &block)
+        end
       end
 
       def method_missing(symbol, &block)