From 24b1d4fc63dc40c6996031a795998a332128c0de Mon Sep 17 00:00:00 2001 From: Andrew White Date: Wed, 10 Apr 2013 08:18:06 +0100 Subject: Return nil for Mime::NullType#ref --- actionpack/lib/action_controller/metal/rendering.rb | 2 +- actionpack/lib/action_dispatch/http/mime_type.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index eabc0fc230..bea6b88f91 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -6,7 +6,7 @@ module ActionController # 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 index c24c9a1bc3..f29ad359ac 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -312,6 +312,10 @@ module Mime true end + def ref + nil + end + def respond_to_missing?(method, include_private = false) method.to_s.ends_with? '?' end -- cgit v1.2.3