Return nil for Mime::NullType#ref

rails · Apr 10, 2013 · 24b1d4f · 24b1d4f
1 parent d50df2f
commit 24b1d4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
@@ -6,7 +6,7 @@ module Rendering
 
     # Before processing, set the request formats in current controller formats.
     def process_action(*) #:nodoc:
-      self.formats = request.formats.select { |x| !x.nil? }.map(&:ref)
+      self.formats = request.formats.map(&:ref).compact
       super
     end
 

diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -312,6 +312,10 @@ def nil?
       true
     end
 
+    def ref
+      nil
+    end
+
     def respond_to_missing?(method, include_private = false)
       method.to_s.ends_with? '?'
     end