aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-04-10 08:18:06 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2013-04-10 08:18:06 +0100
commit24b1d4fc63dc40c6996031a795998a332128c0de (patch)
tree96608565789c28131388136f7a38b4fbf8c109f8 /actionpack/lib/action_controller
parentd50df2f116bfb1f3e897746fb345a5e945650e31 (diff)
downloadrails-24b1d4fc63dc40c6996031a795998a332128c0de.tar.gz
rails-24b1d4fc63dc40c6996031a795998a332128c0de.tar.bz2
rails-24b1d4fc63dc40c6996031a795998a332128c0de.zip
Return nil for Mime::NullType#ref
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb2
1 files changed, 1 insertions, 1 deletions
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