diff options
| author | Jarmo Isotalo <jamo@isotalo.fi> | 2014-02-08 15:30:14 -0800 |
|---|---|---|
| committer | Jarmo Isotalo <jamo@isotalo.fi> | 2014-05-19 00:03:08 +0300 |
| commit | adffea62b5dc494e0e6bc2ca256bb592ce85f112 (patch) | |
| tree | 15c1256914f887bc5b56442eef7b25cd20425822 /actionpack/lib/action_dispatch | |
| parent | d29074af7a3da82ec4bab4f96ab802edeaa1cdb4 (diff) | |
| download | rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.tar.gz rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.tar.bz2 rails-adffea62b5dc494e0e6bc2ca256bb592ce85f112.zip | |
Upgraded rack
As Rack has some non backwards compatible changes added required
modifications to keep behaviour in rails close to same as before.
Also modified generators to include rack/rack for not yet released
version of rack
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_negotiation.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index 0b2b60d2e4..9c8f65deac 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -54,8 +54,14 @@ module ActionDispatch end def formats - @env["action_dispatch.request.formats"] ||= - if parameters[:format] + @env["action_dispatch.request.formats"] ||= begin + params_readable = begin + parameters[:format] + rescue ActionController::BadRequest + false + end + + if params_readable Array(Mime[parameters[:format]]) elsif use_accept_header && valid_accept_header accepts @@ -64,8 +70,8 @@ module ActionDispatch else [Mime::HTML] end + end end - # Sets the \variant for template. def variant=(variant) if variant.is_a?(Symbol) |