aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-14 16:59:47 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-14 17:10:11 -0300
commit4d21e496e1740ec61a6797b8b6644c14c271c6ac (patch)
tree1afbc8762bd05f28c24b00c4283ca2a0a2cc21ee /actionpack/lib
parented6894bf2386cf469018a5b32e60568c8df20e2d (diff)
downloadrails-4d21e496e1740ec61a6797b8b6644c14c271c6ac.tar.gz
rails-4d21e496e1740ec61a6797b8b6644c14c271c6ac.tar.bz2
rails-4d21e496e1740ec61a6797b8b6644c14c271c6ac.zip
Return null type format when format is not know
When requesting a controller with the following code with a unknown format: def my_action respond_to do |format| format.json { head :ok } format.any { render text: 'Default response' } end end we should render the default response instead of raising ActionController::UnknownFormat Fixes #14462 Conflicts: actionpack/CHANGELOG.md actionpack/test/controller/mime/respond_with_test.rb Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_negotiation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index b803ce8b6f..0b2b60d2e4 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -129,7 +129,7 @@ module ActionDispatch
end
end
- order.include?(Mime::ALL) ? formats.first : nil
+ order.include?(Mime::ALL) ? format : nil
end
protected