diff options
| author | Chris Eppstein <chris@eppsteins.net> | 2010-11-05 10:28:35 +0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-06 06:56:36 +0800 |
| commit | b1667c7c2c1aba4a2adb5f36ad9499c01763655d (patch) | |
| tree | 46911924dd1177ca0b6a59a10bac44f242e8dfa5 /actionpack/lib/action_controller/metal/mime_responds.rb | |
| parent | 06d518a32398a4dc7564f45aa19575ea7fa702da (diff) | |
| download | rails-b1667c7c2c1aba4a2adb5f36ad9499c01763655d.tar.gz rails-b1667c7c2c1aba4a2adb5f36ad9499c01763655d.tar.bz2 rails-b1667c7c2c1aba4a2adb5f36ad9499c01763655d.zip | |
Correctly handle the case of an API response that returns a hash by treating a single hash argument as the resource instead of as options.
Diffstat (limited to 'actionpack/lib/action_controller/metal/mime_responds.rb')
| -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 c6d4c6d936..f7dd0dcb69 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -227,7 +227,7 @@ module ActionController #:nodoc: "controller responds to in the class level" if self.class.mimes_for_respond_to.empty? if response = retrieve_response_from_mimes(&block) - options = resources.extract_options! + options = resources.size == 1 ? {} : resources.extract_options! options.merge!(:default_response => response) (options.delete(:responder) || self.class.responder).call(self, resources, options) end |