diff options
| author | grosser <grosser.michael@gmail.com> | 2012-10-02 09:22:26 -0700 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-02-24 11:47:20 -0500 |
| commit | 149e3cd376caa23cf4d8c4b711b95e157186fc94 (patch) | |
| tree | 150e9888b1bae14ceee17d9b39ee4f60188b56d2 /actionpack/lib/action_controller | |
| parent | c3d001b04854d4592d2a16aeddf1b9be006b58a8 (diff) | |
| download | rails-149e3cd376caa23cf4d8c4b711b95e157186fc94.tar.gz rails-149e3cd376caa23cf4d8c4b711b95e157186fc94.tar.bz2 rails-149e3cd376caa23cf4d8c4b711b95e157186fc94.zip | |
fix respond_to without blocks not working if one of the blocks is all
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 93568da9ef..834d44f045 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -420,7 +420,7 @@ module ActionController #:nodoc: end def response - @responses[format] || @responses[Mime::ALL] + @responses.fetch(format, @responses[Mime::ALL]) end def negotiate_format(request) |