diff options
Diffstat (limited to 'actionpack/lib/action_controller/mime_responds.rb')
-rw-r--r-- | actionpack/lib/action_controller/mime_responds.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb index ff4837896c..e1e6790381 100644 --- a/actionpack/lib/action_controller/mime_responds.rb +++ b/actionpack/lib/action_controller/mime_responds.rb @@ -110,7 +110,12 @@ module ActionController #:nodoc: def initialize(block_binding) @block_binding = block_binding - @mime_type_priority = eval("request.accepts", block_binding) + @mime_type_priority = eval( + "(params[:format] && Mime::EXTENSION_LOOKUP[params[:format]]) ? " + + "[ Mime::EXTENSION_LOOKUP[params[:format]] ] : request.accepts", + block_binding + ) + @order = [] @responses = {} end |